From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jeffery Date: Thu, 05 Oct 2017 10:01:50 +1030 Subject: [PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node In-Reply-To: <20171004064917.2498-3-joel@jms.id.au> References: <20171004064917.2498-1-joel@jms.id.au> <20171004064917.2498-3-joel@jms.id.au> Message-ID: <1507159910.5452.34.camel@aj.id.au> List-Id: To: linux-aspeed@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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 Reviewed-by: Andrew Jeffery >  > --- > 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 at 1e6e9000 { > + compatible = "aspeed,ast2400-adc"; > + reg = <0x1e6e9000 0xb0>; > + clocks = <&clk_apb>; > + #io-channel-cells = <1>; > + status = "disabled"; > + }; > + >   sram at 1e720000 { >   compatible = "mmio-sram"; >   reg = <0x1e720000 0x8000>; // 32K > @@ -227,14 +235,6 @@ >   no-loopback-test; >   status = "disabled"; >   }; > - > - adc: adc at 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 at 1e6e9000 { > + compatible = "aspeed,ast2500-adc"; > + reg = <0x1e6e9000 0xb0>; > + clocks = <&clk_apb>; > + #io-channel-cells = <1>; > + status = "disabled"; > + }; > + >   sram at 1e720000 { >   compatible = "mmio-sram"; >   reg = <0x1e720000 0x9000>; // 36K > @@ -307,14 +315,6 @@ >   no-loopback-test; >   status = "disabled"; >   }; > - > - adc: adc at 1e6e9000 { > - compatible = "aspeed,ast2500-adc"; > - reg = <0x1e6e9000 0xb0>; > - clocks = <&clk_apb>; > - #io-channel-cells = <1>; > - status = "disabled"; > - }; >   }; >   }; >  }; -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 801 bytes Desc: This is a digitally signed message part URL: