Re: [PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants

[Andrew Lunn]

On Sun, May 21, 2017 at 02:48:52PM +0200, Ralph Sennhauser wrote:
> 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 

Reviewed-by: Andrew Lunn 

Andrew

[PATCH 03/13] ARM: dts: armada-385-linksys: flatten dependants

[Ralph Sennhauser]

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 

---

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";
+   };