On Sun, May 28, 2017 at 11:09 PM, Chen-Yu Tsai <wens@xxxxxxxx> wrote: > On Sat, May 27, 2017 at 6:23 PM, Icenowy Zheng <icenowy@xxxxxxx> 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 <icenowy@xxxxxxx> >> Acked-by: Rob Herring <robh@xxxxxxxxxx> > > Reviewed-by: Chen-Yu Tsai <wens@xxxxxxxx> Fixed the conflict and applied for 4.14. Next time please include this when you send the driver patches. ChenYu -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html