From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@bootlin.com (Maxime Ripard) Date: Mon, 19 Mar 2018 22:27:05 +0100 Subject: [PATCH 2/2] arm64: allwinner: h6: temporarily drop the usage of CCU headers in DTSI In-Reply-To: <20180319081108.23496-2-icenowy@aosc.io> References: <20180319081108.23496-1-icenowy@aosc.io> <20180319081108.23496-2-icenowy@aosc.io> Message-ID: <20180319212705.7u5yqz4mk644aomk@flea> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Mar 19, 2018 at 04:11:08PM +0800, Icenowy Zheng wrote: > As the CCU driver will be merged in different tree with the device tree, > temporarily drop the usage of CCU headers in the DTSI file, and replace > macros with the corresponding numbers. > > After they are both merged into Linus' tree, it can be switched back to > use the CCU headers. > > Signed-off-by: Icenowy Zheng > --- > arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 20 +++++++++----------- > 1 file changed, 9 insertions(+), 11 deletions(-) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > index 4debc3962830..56563150d61a 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi > @@ -4,8 +4,6 @@ > */ > > #include > -#include > -#include > > / { > interrupt-parent = <&gic>; > @@ -117,7 +115,7 @@ > , > , > ; > - clocks = <&ccu CLK_APB1>, <&osc24M>, <&osc32k>; > + clocks = <&ccu 26>, <&osc24M>, <&osc32k>; > clock-names = "apb", "hosc", "losc"; > gpio-controller; > #gpio-cells = <3>; > @@ -136,8 +134,8 @@ > interrupts = ; > reg-shift = <2>; > reg-io-width = <4>; > - clocks = <&ccu CLK_BUS_UART0>; > - resets = <&ccu RST_BUS_UART0>; > + clocks = <&ccu 70>; > + resets = <&ccu 21>; > status = "disabled"; > }; > > @@ -147,8 +145,8 @@ > interrupts = ; > reg-shift = <2>; > reg-io-width = <4>; > - clocks = <&ccu CLK_BUS_UART1>; > - resets = <&ccu RST_BUS_UART1>; > + clocks = <&ccu 71>; > + resets = <&ccu 22>; > status = "disabled"; > }; > > @@ -158,8 +156,8 @@ > interrupts = ; > reg-shift = <2>; > reg-io-width = <4>; > - clocks = <&ccu CLK_BUS_UART2>; > - resets = <&ccu RST_BUS_UART2>; > + clocks = <&ccu 72>; > + resets = <&ccu 23>; > status = "disabled"; > }; > > @@ -169,8 +167,8 @@ > interrupts = ; > reg-shift = <2>; > reg-io-width = <4>; > - clocks = <&ccu CLK_BUS_UART3>; > - resets = <&ccu RST_BUS_UART3>; > + clocks = <&ccu 73>; > + resets = <&ccu 24>; Thanks, I squashed a similar patch earlier. Maxime -- Maxime Ripard, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: