| Message ID | 20171004064917.2498-3-joel@jms.id.au |
|---|---|
| State | Accepted |
| Commit | 29b246400cc0e8c5e0e2f9d0206c53df93b79bea |
| Headers | show |
| Series | [v2,1/9] ARM: dts: aspeed: Move pinctrl subnodes to improve readability | expand |
On Wed, 2017-10-04 at 17:19 +1030, Joel Stanley wrote: > We try to keep the nodes in address order. The ADC node was out of > place. > > Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Andrew Jeffery <andrew@aj.id.au> > > --- > v2: > - Don't introduce new clk bindings > --- > arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++-------- > arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++-------- > 2 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi > index 1edd0cee6221..c2d96b8a5065 100644 > --- a/arch/arm/boot/dts/aspeed-g4.dtsi > +++ b/arch/arm/boot/dts/aspeed-g4.dtsi > @@ -129,6 +129,14 @@ > }; > }; > > + adc: adc@1e6e9000 { > + compatible = "aspeed,ast2400-adc"; > + reg = <0x1e6e9000 0xb0>; > + clocks = <&clk_apb>; > + #io-channel-cells = <1>; > + status = "disabled"; > + }; > + > sram@1e720000 { > compatible = "mmio-sram"; > reg = <0x1e720000 0x8000>; // 32K > @@ -227,14 +235,6 @@ > no-loopback-test; > status = "disabled"; > }; > - > - adc: adc@1e6e9000 { > - compatible = "aspeed,ast2400-adc"; > - reg = <0x1e6e9000 0xb0>; > - clocks = <&clk_apb>; > - #io-channel-cells = <1>; > - status = "disabled"; > - }; > }; > }; > }; > diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi > index f56dd67efa50..9e71c2dac0ba 100644 > --- a/arch/arm/boot/dts/aspeed-g5.dtsi > +++ b/arch/arm/boot/dts/aspeed-g5.dtsi > @@ -173,6 +173,14 @@ > reg-io-width = <4>; > }; > > + adc: adc@1e6e9000 { > + compatible = "aspeed,ast2500-adc"; > + reg = <0x1e6e9000 0xb0>; > + clocks = <&clk_apb>; > + #io-channel-cells = <1>; > + status = "disabled"; > + }; > + > sram@1e720000 { > compatible = "mmio-sram"; > reg = <0x1e720000 0x9000>; // 36K > @@ -307,14 +315,6 @@ > no-loopback-test; > status = "disabled"; > }; > - > - adc: adc@1e6e9000 { > - compatible = "aspeed,ast2500-adc"; > - reg = <0x1e6e9000 0xb0>; > - clocks = <&clk_apb>; > - #io-channel-cells = <1>; > - status = "disabled"; > - }; > }; > }; > };
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 1edd0cee6221..c2d96b8a5065 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -129,6 +129,14 @@ }; }; + adc: adc@1e6e9000 { + compatible = "aspeed,ast2400-adc"; + reg = <0x1e6e9000 0xb0>; + clocks = <&clk_apb>; + #io-channel-cells = <1>; + status = "disabled"; + }; + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x8000>; // 32K @@ -227,14 +235,6 @@ no-loopback-test; status = "disabled"; }; - - adc: adc@1e6e9000 { - compatible = "aspeed,ast2400-adc"; - reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; - #io-channel-cells = <1>; - status = "disabled"; - }; }; }; }; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index f56dd67efa50..9e71c2dac0ba 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -173,6 +173,14 @@ reg-io-width = <4>; }; + adc: adc@1e6e9000 { + compatible = "aspeed,ast2500-adc"; + reg = <0x1e6e9000 0xb0>; + clocks = <&clk_apb>; + #io-channel-cells = <1>; + status = "disabled"; + }; + sram@1e720000 { compatible = "mmio-sram"; reg = <0x1e720000 0x9000>; // 36K @@ -307,14 +315,6 @@ no-loopback-test; status = "disabled"; }; - - adc: adc@1e6e9000 { - compatible = "aspeed,ast2500-adc"; - reg = <0x1e6e9000 0xb0>; - clocks = <&clk_apb>; - #io-channel-cells = <1>; - status = "disabled"; - }; }; }; };
We try to keep the nodes in address order. The ADC node was out of place. Signed-off-by: Joel Stanley <joel@jms.id.au> --- v2: - Don't introduce new clk bindings --- arch/arm/boot/dts/aspeed-g4.dtsi | 16 ++++++++-------- arch/arm/boot/dts/aspeed-g5.dtsi | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) -- 2.14.1