Message ID | 20170527102308.1988-8-icenowy@aosc.io (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sat, May 27, 2017 at 6:23 PM, Icenowy Zheng <icenowy@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 <icenowy@aosc.io> > Acked-by: Rob Herring <robh@kernel.org> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
On Sun, May 28, 2017 at 11:09 PM, Chen-Yu Tsai <wens@csie.org> wrote: > On Sat, May 27, 2017 at 6:23 PM, Icenowy Zheng <icenowy@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 <icenowy@aosc.io> >> Acked-by: Rob Herring <robh@kernel.org> > > Reviewed-by: Chen-Yu Tsai <wens@csie.org> Fixed the conflict and applied for 4.14. Next time please include this when you send the driver patches. ChenYu
diff --git a/Documentation/devicetree/bindings/clock/sunxi-ccu.txt b/Documentation/devicetree/bindings/clock/sunxi-ccu.txt index 34b2a9249a94..80926c5db86b 100644 --- a/Documentation/devicetree/bindings/clock/sunxi-ccu.txt +++ b/Documentation/devicetree/bindings/clock/sunxi-ccu.txt @@ -9,6 +9,7 @@ Required properties : - "allwinner,sun8i-a83t-ccu" - "allwinner,sun8i-h3-ccu" - "allwinner,sun8i-h3-r-ccu" + - "allwinner,sun8i-r40-ccu" - "allwinner,sun8i-v3s-ccu" - "allwinner,sun9i-a80-ccu" - "allwinner,sun50i-a64-ccu"