Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1741250
| From | Joel Stanley <joel@jms.id.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/8] ARM: dts: aspeed: Reorder ADC node |
| Date | 2017-09-28 10:00 +0200 |
| Message-ID | <uuBTL-6bp-35@gated-at.bofh.it> (permalink) |
| References | <uuBTI-6bp-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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>;
+ #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>;
+ clocks = <&syscon ASPEED_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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/8] ARM: dts: aspeed: Device tree updates Joel Stanley <joel@jms.id.au> - 2017-09-28 10:00 +0200
[PATCH 2/8] ARM: dts: aspeed: Reorder ADC node Joel Stanley <joel@jms.id.au> - 2017-09-28 10:00 +0200
[PATCH 5/8] ARM: dts: aspeed-palmetto: Add I2C devices Joel Stanley <joel@jms.id.au> - 2017-09-28 10:00 +0200
Re: [PATCH 5/8] ARM: dts: aspeed-palmetto: Add I2C devices Brendan Higgins <brendanhiggins@google.com> - 2017-09-28 20:40 +0200
[PATCH 4/8] ARM: dts: aspeed-romulus: Add I2C devices Joel Stanley <joel@jms.id.au> - 2017-09-28 10:00 +0200
Re: [PATCH 4/8] ARM: dts: aspeed-romulus: Add I2C devices Brendan Higgins <brendanhiggins@google.com> - 2017-09-28 20:40 +0200
csiph-web