From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Gregory Clement <gregory.clement@free-electrons.com>,
Imre Kaloz <kaloz@openwrt.org>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Russell King <linux@armlinux.org.uk>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Ralph Sennhauser <ralph.sennhauser@gmail.com>
Subject: [PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants
Date: Sun, 21 May 2017 14:48:52 +0200 [thread overview]
Message-ID: <20170521124903.11050-4-ralph.sennhauser@gmail.com> (raw)
In-Reply-To: <20170521124903.11050-1-ralph.sennhauser@gmail.com>
Flatten dts of individual boards to match the new style used in
armada-385-linksys.dtsi and for the Rango addition.
* Caiman - Linksys WRT1200AC v1 & v2
* Cobra - Linksys WRT1900AC v2
* Shelby - Linksys WRT1900ACS v1 & v2
Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---
Notes:
power and sata in &gpio_leds don't use references when they could,
feels like overdoing things even though it violates one of the guiding
principles of not recreating structure. If someone thinks such a
change is meaningful I don't mind submitting a followup patch, though
would look odd with the Rango dts.
---
arch/arm/boot/dts/armada-385-linksys-caiman.dts | 99 ++++++++++++-------------
arch/arm/boot/dts/armada-385-linksys-cobra.dts | 99 ++++++++++++-------------
arch/arm/boot/dts/armada-385-linksys-shelby.dts | 99 ++++++++++++-------------
3 files changed, 138 insertions(+), 159 deletions(-)
diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index f3cee91..765c939 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -44,71 +44,64 @@
model = "Linksys WRT1200AC";
compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",
"marvell,armada380";
+};
- soc {
- internal-regs{
- i2c@11000 {
-
- pca9635@68 {
- #address-cells = <1>;
- #size-cells = <0>;
+&expander0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
- wan_amber@0 {
- label = "caiman:amber:wan";
- reg = <0x0>;
- };
+ wan_amber@0 {
+ label = "caiman:amber:wan";
+ reg = <0x0>;
+ };
- wan_white@1 {
- label = "caiman:white:wan";
- reg = <0x1>;
- };
+ wan_white@1 {
+ label = "caiman:white:wan";
+ reg = <0x1>;
+ };
- wlan_2g@2 {
- label = "caiman:white:wlan_2g";
- reg = <0x2>;
- };
+ wlan_2g@2 {
+ label = "caiman:white:wlan_2g";
+ reg = <0x2>;
+ };
- wlan_5g@3 {
- label = "caiman:white:wlan_5g";
- reg = <0x3>;
- };
+ wlan_5g@3 {
+ label = "caiman:white:wlan_5g";
+ reg = <0x3>;
+ };
- usb2@5 {
- label = "caiman:white:usb2";
- reg = <0x5>;
- };
+ usb2@5 {
+ label = "caiman:white:usb2";
+ reg = <0x5>;
+ };
- usb3_1@6 {
- label = "caiman:white:usb3_1";
- reg = <0x6>;
- };
+ usb3_1@6 {
+ label = "caiman:white:usb3_1";
+ reg = <0x6>;
+ };
- usb3_2@7 {
- label = "caiman:white:usb3_2";
- reg = <0x7>;
- };
+ usb3_2@7 {
+ label = "caiman:white:usb3_2";
+ reg = <0x7>;
+ };
- wps_white@8 {
- label = "caiman:white:wps";
- reg = <0x8>;
- };
+ wps_white@8 {
+ label = "caiman:white:wps";
+ reg = <0x8>;
+ };
- wps_amber@9 {
- label = "caiman:amber:wps";
- reg = <0x9>;
- };
- };
- };
- };
+ wps_amber@9 {
+ label = "caiman:amber:wps";
+ reg = <0x9>;
};
+};
- gpio-leds {
- power {
- label = "caiman:white:power";
- };
+&gpio_leds {
+ power {
+ label = "caiman:white:power";
+ };
- sata {
- label = "caiman:white:sata";
- };
+ sata {
+ label = "caiman:white:sata";
};
};
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index 1110718..2ae1e71 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -44,71 +44,64 @@
model = "Linksys WRT1900ACv2";
compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",
"marvell,armada380";
+};
- soc {
- internal-regs{
- i2c@11000 {
-
- pca9635@68 {
- #address-cells = <1>;
- #size-cells = <0>;
+&expander0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
- wan_amber@0 {
- label = "cobra:amber:wan";
- reg = <0x0>;
- };
+ wan_amber@0 {
+ label = "cobra:amber:wan";
+ reg = <0x0>;
+ };
- wan_white@1 {
- label = "cobra:white:wan";
- reg = <0x1>;
- };
+ wan_white@1 {
+ label = "cobra:white:wan";
+ reg = <0x1>;
+ };
- wlan_2g@2 {
- label = "cobra:white:wlan_2g";
- reg = <0x2>;
- };
+ wlan_2g@2 {
+ label = "cobra:white:wlan_2g";
+ reg = <0x2>;
+ };
- wlan_5g@3 {
- label = "cobra:white:wlan_5g";
- reg = <0x3>;
- };
+ wlan_5g@3 {
+ label = "cobra:white:wlan_5g";
+ reg = <0x3>;
+ };
- usb2@5 {
- label = "cobra:white:usb2";
- reg = <0x5>;
- };
+ usb2@5 {
+ label = "cobra:white:usb2";
+ reg = <0x5>;
+ };
- usb3_1@6 {
- label = "cobra:white:usb3_1";
- reg = <0x6>;
- };
+ usb3_1@6 {
+ label = "cobra:white:usb3_1";
+ reg = <0x6>;
+ };
- usb3_2@7 {
- label = "cobra:white:usb3_2";
- reg = <0x7>;
- };
+ usb3_2@7 {
+ label = "cobra:white:usb3_2";
+ reg = <0x7>;
+ };
- wps_white@8 {
- label = "cobra:white:wps";
- reg = <0x8>;
- };
+ wps_white@8 {
+ label = "cobra:white:wps";
+ reg = <0x8>;
+ };
- wps_amber@9 {
- label = "cobra:amber:wps";
- reg = <0x9>;
- };
- };
- };
- };
+ wps_amber@9 {
+ label = "cobra:amber:wps";
+ reg = <0x9>;
};
+};
- gpio-leds {
- power {
- label = "cobra:white:power";
- };
+&gpio_leds {
+ power {
+ label = "cobra:white:power";
+ };
- sata {
- label = "cobra:white:sata";
- };
+ sata {
+ label = "cobra:white:sata";
};
};
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index c7a8ddd..74f4273 100644
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -44,71 +44,64 @@
model = "Linksys WRT1900ACS";
compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385",
"marvell,armada380";
+};
- soc {
- internal-regs{
- i2c@11000 {
-
- pca9635@68 {
- #address-cells = <1>;
- #size-cells = <0>;
+&expander0 {
+ #address-cells = <1>;
+ #size-cells = <0>;
- wan_amber@0 {
- label = "shelby:amber:wan";
- reg = <0x0>;
- };
+ wan_amber@0 {
+ label = "shelby:amber:wan";
+ reg = <0x0>;
+ };
- wan_white@1 {
- label = "shelby:white:wan";
- reg = <0x1>;
- };
+ wan_white@1 {
+ label = "shelby:white:wan";
+ reg = <0x1>;
+ };
- wlan_2g@2 {
- label = "shelby:white:wlan_2g";
- reg = <0x2>;
- };
+ wlan_2g@2 {
+ label = "shelby:white:wlan_2g";
+ reg = <0x2>;
+ };
- wlan_5g@3 {
- label = "shelby:white:wlan_5g";
- reg = <0x3>;
- };
+ wlan_5g@3 {
+ label = "shelby:white:wlan_5g";
+ reg = <0x3>;
+ };
- usb2@5 {
- label = "shelby:white:usb2";
- reg = <0x5>;
- };
+ usb2@5 {
+ label = "shelby:white:usb2";
+ reg = <0x5>;
+ };
- usb3_1@6 {
- label = "shelby:white:usb3_1";
- reg = <0x6>;
- };
+ usb3_1@6 {
+ label = "shelby:white:usb3_1";
+ reg = <0x6>;
+ };
- usb3_2@7 {
- label = "shelby:white:usb3_2";
- reg = <0x7>;
- };
+ usb3_2@7 {
+ label = "shelby:white:usb3_2";
+ reg = <0x7>;
+ };
- wps_white@8 {
- label = "shelby:white:wps";
- reg = <0x8>;
- };
+ wps_white@8 {
+ label = "shelby:white:wps";
+ reg = <0x8>;
+ };
- wps_amber@9 {
- label = "shelby:amber:wps";
- reg = <0x9>;
- };
- };
- };
- };
+ wps_amber@9 {
+ label = "shelby:amber:wps";
+ reg = <0x9>;
};
+};
- gpio-leds {
- power {
- label = "shelby:white:power";
- };
+&gpio_leds {
+ power {
+ label = "shelby:white:power";
+ };
- sata {
- label = "shelby:white:sata";
- };
+ sata {
+ label = "shelby:white:sata";
};
};
--
2.10.2
next prev parent reply other threads:[~2017-05-21 12:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-21 12:48 [PATCH 00/13] Linksys WRT3200ACM (Rango) support Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 01/13] ARM: dts: armada-385-linksys: flatten dtsi Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 02/13] ARM: dts: armada-385-linksys: label nodes Ralph Sennhauser
2017-05-22 14:49 ` Andrew Lunn
2017-05-21 12:48 ` Ralph Sennhauser [this message]
2017-05-22 14:51 ` [PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants Andrew Lunn
2017-05-21 12:48 ` [PATCH 04/13] ARM: dts: armada-385-linksys: drop redundant properties in dependants Ralph Sennhauser
2017-05-22 14:52 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 05/13] ARM: dts: armada-385-linksys: bm pools by label order Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 06/13] ARM: dts: armada-385-linksys: usb3 label cleanup Ralph Sennhauser
2017-05-22 14:55 ` Andrew Lunn
2017-05-22 18:13 ` Ralph Sennhauser
2017-05-21 12:48 ` [PATCH 07/13] ARM: dts: armada-385-linksys: drop leagcy DSA bindings Ralph Sennhauser
2017-05-22 14:55 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 08/13] ARM: dts: armada-385-linksys: use binary unit prefixes Ralph Sennhauser
2017-05-22 15:00 ` Andrew Lunn
2017-05-22 18:24 ` Ralph Sennhauser
2017-05-23 8:33 ` Ralph Sennhauser
2017-05-23 12:02 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 09/13] ARM: dts: armada-385-linksys: partition layout is board specific Ralph Sennhauser
2017-05-23 12:04 ` Andrew Lunn
2017-05-21 12:48 ` [PATCH 10/13] ARM: dts: armada-385-linksys: group pins in pinctrl Ralph Sennhauser
2017-05-23 12:06 ` Andrew Lunn
2017-05-21 12:49 ` [PATCH 11/13] ARM: dts: armada-385-linksys: fixup button node names Ralph Sennhauser
2017-05-23 12:07 ` Andrew Lunn
2017-05-21 12:49 ` [PATCH 12/13] clk: mvebu: add support for 1866MHz variants Ralph Sennhauser
2017-05-23 12:15 ` Andrew Lunn
2017-05-23 19:55 ` Ralph Sennhauser
2017-05-21 12:49 ` [PATCH 13/13] ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango) Ralph Sennhauser
2017-05-23 12:18 ` Andrew Lunn
2017-05-23 12:25 ` Andrew Lunn
2017-05-23 20:04 ` Ralph Sennhauser
2017-05-22 18:42 ` [PATCH 00/13] Linksys WRT3200ACM (Rango) support Imre Kaloz
2017-05-23 15:22 ` Gregory CLEMENT
2017-05-23 16:11 ` Ralph Sennhauser
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=20170521124903.11050-4-ralph.sennhauser@gmail.com \
--to=ralph.sennhauser@gmail.com \
--cc=andrew@lunn.ch \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=kaloz@openwrt.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
/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
Powered by JetHome