projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 77c82b5)
ARM: dts: armada-385-linksys: flatten dependants
authorRalph Sennhauser <ralph.sennhauser@gmail.com>
Sun, 21 May 2017 12:48:52 +0000 (14:48 +0200)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Sat, 17 Jun 2017 06:16:45 +0000 (08:16 +0200)
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>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm/boot/dts/armada-385-linksys-caiman.dts patch | blob | blame | history
arch/arm/boot/dts/armada-385-linksys-cobra.dts patch | blob | blame | history
arch/arm/boot/dts/armada-385-linksys-shelby.dts patch | blob | blame | history

diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index f3cee918d28500de6498c5cdb9868fe924fd6cbe..765c9394d02ccc197b1fbf7e2bc0ad0c1b10f810 100644 (file)
--- 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 11107186055980d9831b07890cdb14846befd599..2ae1e7164f79fc9afbed3eb18d77a15eb39d0341 100644 (file)
--- 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 c7a8ddd7f9a55487c72d27e6f9b0bed732858ce2..74f42731462620ba2d2cd60c0def19e8c78f0436 100644 (file)
--- 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";
        };
 };