From: Joel Stanley <joel@jms.id.au>
To: linux-aspeed@lists.ozlabs.org
Subject: [PATCH 2/8] ARM: dts: aspeed: Reorder ADC node
Date: Thu, 28 Sep 2017 17:21:43 +0930 [thread overview]
Message-ID: <20170928075149.8154-3-joel@jms.id.au> (raw)
In-Reply-To: <20170928075149.8154-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>
---
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 at 1e6e9000 {
+ compatible = "aspeed,ast2400-adc";
+ reg = <0x1e6e9000 0xb0>;
+ clocks = <&syscon ASPEED_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..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 at 1e6e9000 {
+ compatible = "aspeed,ast2500-adc";
+ reg = <0x1e6e9000 0xb0>;
+ clocks = <&syscon ASPEED_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-09-28 7:51 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-28 7:51 [PATCH 0/8] ARM: dts: aspeed: Device tree updates Joel Stanley
2017-09-28 7:51 ` [PATCH 1/8] ARM: dts: aspeed: Move pinctrl subnodes to improve readability Joel Stanley
2017-10-04 3:30 ` Andrew Jeffery
2017-09-28 7:51 ` Joel Stanley [this message]
2017-10-04 3:35 ` [PATCH 2/8] ARM: dts: aspeed: Reorder ADC node Andrew Jeffery
2017-10-04 5:13 ` Joel Stanley
2017-10-04 5:21 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 3/8] ARM: dts: aspeed: Add I2C buses Joel Stanley
2017-09-28 18:35 ` Brendan Higgins
2017-10-04 4:36 ` Andrew Jeffery
2017-10-04 4:41 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 4/8] ARM: dts: aspeed-romulus: Add I2C devices Joel Stanley
2017-09-28 18:36 ` Brendan Higgins
2017-10-04 5:02 ` Andrew Jeffery
2017-10-04 5:24 ` Joel Stanley
2017-09-28 7:51 ` [PATCH 5/8] ARM: dts: aspeed-palmetto: " Joel Stanley
2017-09-28 18:36 ` Brendan Higgins
2017-10-04 5:08 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 6/8] ARM: dts: aspeed-ast2500: " Joel Stanley
2017-09-28 18:37 ` Brendan Higgins
2017-10-04 5:12 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 7/8] ARM: dts: aspeed: Add aliases for UARTs Joel Stanley
2017-10-04 5:13 ` Andrew Jeffery
2017-09-28 7:51 ` [PATCH 8/8] ARM: dts: aspeed: Clean up UART nodes Joel Stanley
2017-10-04 5:28 ` Andrew Jeffery
2017-10-04 6:00 ` Joel Stanley
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=20170928075149.8154-3-joel@jms.id.au \
--to=joel@jms.id.au \
--cc=linux-aspeed@lists.ozlabs.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox