On Sun, May 28, 2017 at 11:09 PM, Chen-Yu Tsai <w...@csie.org> wrote:
> On Sat, May 27, 2017 at 6:23 PM, Icenowy Zheng <icen...@aosc.io> wrote:
>> Allwinner R40 has a clock controlling unit like the ones on other
>> Allwinner SoCs after sun6i, and can also use a CCU-based driver.
>>
>> Add a compatible string for it.
>>
>> Signed-off-by: Icenowy Zheng <icen...@aosc.io>
>> Acked-by: Rob Herring <r...@kernel.org>
>
> Reviewed-by: Chen-Yu Tsai <w...@csie.org>

Fixed the conflict and applied for 4.14. Next time please include this when you
send the driver patches.

ChenYu

Reply via email to