lkml.org 
[lkml]   [2017]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH 2/8] ARM: dts: aspeed: Reorder ADC node
    From
    Date
    On Thu, 2017-09-28 at 17:21 +0930, 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>
    > ---
    >  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..a4579498fc25 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 = <&syscon ASPEED_CLK_APB>;

    We can't do this yet as the clk driver isn't yet merged, and it breaks from the
    "just move the node" description in the commit message.

    > + #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..f6430b313f90 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>;

    Did you intend to change the size cell value here? It now matches the g4, but
    there was an explicit comment about the size for some reason in the -hunk
    below. It's probably worth an explicit call-out if we're going to change it. 

    > + clocks = <&syscon ASPEED_CLK_APB>;

    See the clk comment on the g4 diff.

    Cheers,

    Andrew

    > + #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";
    > - };
    >   };
    >   };
    >  };[unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2017-10-04 05:36    [W:4.073 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site