From: Joel Stanley <joel@jms.id.au> To: Joel Stanley <joel@jms.id.au>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com> Cc: "Russell King" <linux@armlinux.org.uk>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Andrew Jeffery" <andrew@aj.id.au>, "Rick Altherr" <raltherr@google.com>, "Brendan Higgins" <brendanhiggins@google.com>, "Cédric Le Goater" <clg@kaod.org>, linux-aspeed@lists.ozlabs.org Subject: [PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node Date: Wed, 4 Oct 2017 17:19:10 +1030 [thread overview] Message-ID: <20171004064917.2498-3-joel@jms.id.au> (raw) In-Reply-To: <20171004064917.2498-1-joel@jms.id.au> 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(-) 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"; - }; }; }; }; -- 2.14.1
WARNING: multiple messages have this Message-ID (diff)
From: joel@jms.id.au (Joel Stanley) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node Date: Wed, 4 Oct 2017 17:19:10 +1030 [thread overview] Message-ID: <20171004064917.2498-3-joel@jms.id.au> (raw) In-Reply-To: <20171004064917.2498-1-joel@jms.id.au> 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(-) 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"; - }; }; }; }; -- 2.14.1
next prev parent reply other threads:[~2017-10-04 6:49 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-04 6:49 [PATCH v2 0/9] ARM: dts: aspeed: Device tree updates Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` [PATCH v2 1/9] ARM: dts: aspeed: Move pinctrl subnodes to improve readability Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` Joel Stanley [this message] 2017-10-04 6:49 ` [PATCH v2 2/9] ARM: dts: aspeed: Reorder ADC node Joel Stanley 2017-10-04 23:31 ` Andrew Jeffery 2017-10-04 23:31 ` Andrew Jeffery 2017-10-04 6:49 ` [PATCH v2 3/9] ARM: dts: aspeed: Add I2C buses Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` [PATCH v2 4/9] ARM: dts: aspeed-romulus: Add I2C devices Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 23:35 ` Andrew Jeffery 2017-10-04 23:35 ` Andrew Jeffery 2017-10-04 23:35 ` Andrew Jeffery 2017-10-04 6:49 ` [PATCH v2 5/9] ARM: dts: aspeed-palmetto: " Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` [PATCH v2 6/9] ARM: dts: aspeed-ast2500: " Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` [PATCH v2 7/9] ARM: dts: aspeed: Add aliases for UARTs Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` [PATCH v2 8/9] ARM: dts: aspeed: Correctly order UART nodes Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 23:37 ` Andrew Jeffery 2017-10-04 23:37 ` Andrew Jeffery 2017-10-04 23:37 ` Andrew Jeffery 2017-10-04 6:49 ` [PATCH v2 9/9] ARM: dts: aspeed: Clean up " Joel Stanley 2017-10-04 6:49 ` Joel Stanley 2017-10-04 6:52 ` Joel Stanley 2017-10-04 6:52 ` Joel Stanley 2017-10-04 6:52 ` Joel Stanley 2017-10-04 23:39 ` Andrew Jeffery 2017-10-04 23:39 ` Andrew Jeffery 2017-10-04 23:39 ` Andrew Jeffery
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20171004064917.2498-3-joel@jms.id.au \ --to=joel@jms.id.au \ --cc=andrew@aj.id.au \ --cc=brendanhiggins@google.com \ --cc=clg@kaod.org \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=raltherr@google.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.