aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Sennhauser <ralph.sennhauser@gmail.com>2017-05-21 08:48:52 -0400
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-06-17 02:16:45 -0400
commitecdcd24864ca42d6f4ebd7cb6e340c6333b51a79 (patch)
treecc2a7f6d01d3204e3a55149c330d23d561f660ea
parent77c82b5f83e07591710f43abf4c85e1897f2114d (diff)
ARM: dts: armada-385-linksys: flatten dependants
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>
-rw-r--r--arch/arm/boot/dts/armada-385-linksys-caiman.dts99
-rw-r--r--arch/arm/boot/dts/armada-385-linksys-cobra.dts99
-rw-r--r--arch/arm/boot/dts/armada-385-linksys-shelby.dts99
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 f3cee918d285..765c9394d02c 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 @@
44 model = "Linksys WRT1200AC"; 44 model = "Linksys WRT1200AC";
45 compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385", 45 compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",
46 "marvell,armada380"; 46 "marvell,armada380";
47};
47 48
48 soc { 49&expander0 {
49 internal-regs{ 50 #address-cells = <1>;
50 i2c@11000 { 51 #size-cells = <0>;
51
52 pca9635@68 {
53 #address-cells = <1>;
54 #size-cells = <0>;
55 52
56 wan_amber@0 { 53 wan_amber@0 {
57 label = "caiman:amber:wan"; 54 label = "caiman:amber:wan";
58 reg = <0x0>; 55 reg = <0x0>;
59 }; 56 };
60 57
61 wan_white@1 { 58 wan_white@1 {
62 label = "caiman:white:wan"; 59 label = "caiman:white:wan";
63 reg = <0x1>; 60 reg = <0x1>;
64 }; 61 };
65 62
66 wlan_2g@2 { 63 wlan_2g@2 {
67 label = "caiman:white:wlan_2g"; 64 label = "caiman:white:wlan_2g";
68 reg = <0x2>; 65 reg = <0x2>;
69 }; 66 };
70 67
71 wlan_5g@3 { 68 wlan_5g@3 {
72 label = "caiman:white:wlan_5g"; 69 label = "caiman:white:wlan_5g";
73 reg = <0x3>; 70 reg = <0x3>;
74 }; 71 };
75 72
76 usb2@5 { 73 usb2@5 {
77 label = "caiman:white:usb2"; 74 label = "caiman:white:usb2";
78 reg = <0x5>; 75 reg = <0x5>;
79 }; 76 };
80 77
81 usb3_1@6 { 78 usb3_1@6 {
82 label = "caiman:white:usb3_1"; 79 label = "caiman:white:usb3_1";
83 reg = <0x6>; 80 reg = <0x6>;
84 }; 81 };
85 82
86 usb3_2@7 { 83 usb3_2@7 {
87 label = "caiman:white:usb3_2"; 84 label = "caiman:white:usb3_2";
88 reg = <0x7>; 85 reg = <0x7>;
89 }; 86 };
90 87
91 wps_white@8 { 88 wps_white@8 {
92 label = "caiman:white:wps"; 89 label = "caiman:white:wps";
93 reg = <0x8>; 90 reg = <0x8>;
94 }; 91 };
95 92
96 wps_amber@9 { 93 wps_amber@9 {
97 label = "caiman:amber:wps"; 94 label = "caiman:amber:wps";
98 reg = <0x9>; 95 reg = <0x9>;
99 };
100 };
101 };
102 };
103 }; 96 };
97};
104 98
105 gpio-leds { 99&gpio_leds {
106 power { 100 power {
107 label = "caiman:white:power"; 101 label = "caiman:white:power";
108 }; 102 };
109 103
110 sata { 104 sata {
111 label = "caiman:white:sata"; 105 label = "caiman:white:sata";
112 };
113 }; 106 };
114}; 107};
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index 111071860559..2ae1e7164f79 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 @@
44 model = "Linksys WRT1900ACv2"; 44 model = "Linksys WRT1900ACv2";
45 compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385", 45 compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",
46 "marvell,armada380"; 46 "marvell,armada380";
47};
47 48
48 soc { 49&expander0 {
49 internal-regs{ 50 #address-cells = <1>;
50 i2c@11000 { 51 #size-cells = <0>;
51
52 pca9635@68 {
53 #address-cells = <1>;
54 #size-cells = <0>;
55 52
56 wan_amber@0 { 53 wan_amber@0 {
57 label = "cobra:amber:wan"; 54 label = "cobra:amber:wan";
58 reg = <0x0>; 55 reg = <0x0>;
59 }; 56 };
60 57
61 wan_white@1 { 58 wan_white@1 {
62 label = "cobra:white:wan"; 59 label = "cobra:white:wan";
63 reg = <0x1>; 60 reg = <0x1>;
64 }; 61 };
65 62
66 wlan_2g@2 { 63 wlan_2g@2 {
67 label = "cobra:white:wlan_2g"; 64 label = "cobra:white:wlan_2g";
68 reg = <0x2>; 65 reg = <0x2>;
69 }; 66 };
70 67
71 wlan_5g@3 { 68 wlan_5g@3 {
72 label = "cobra:white:wlan_5g"; 69 label = "cobra:white:wlan_5g";
73 reg = <0x3>; 70 reg = <0x3>;
74 }; 71 };
75 72
76 usb2@5 { 73 usb2@5 {
77 label = "cobra:white:usb2"; 74 label = "cobra:white:usb2";
78 reg = <0x5>; 75 reg = <0x5>;
79 }; 76 };
80 77
81 usb3_1@6 { 78 usb3_1@6 {
82 label = "cobra:white:usb3_1"; 79 label = "cobra:white:usb3_1";
83 reg = <0x6>; 80 reg = <0x6>;
84 }; 81 };
85 82
86 usb3_2@7 { 83 usb3_2@7 {
87 label = "cobra:white:usb3_2"; 84 label = "cobra:white:usb3_2";
88 reg = <0x7>; 85 reg = <0x7>;
89 }; 86 };
90 87
91 wps_white@8 { 88 wps_white@8 {
92 label = "cobra:white:wps"; 89 label = "cobra:white:wps";
93 reg = <0x8>; 90 reg = <0x8>;
94 }; 91 };
95 92
96 wps_amber@9 { 93 wps_amber@9 {
97 label = "cobra:amber:wps"; 94 label = "cobra:amber:wps";
98 reg = <0x9>; 95 reg = <0x9>;
99 };
100 };
101 };
102 };
103 }; 96 };
97};
104 98
105 gpio-leds { 99&gpio_leds {
106 power { 100 power {
107 label = "cobra:white:power"; 101 label = "cobra:white:power";
108 }; 102 };
109 103
110 sata { 104 sata {
111 label = "cobra:white:sata"; 105 label = "cobra:white:sata";
112 };
113 }; 106 };
114}; 107};
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index c7a8ddd7f9a5..74f427314626 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 @@
44 model = "Linksys WRT1900ACS"; 44 model = "Linksys WRT1900ACS";
45 compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385", 45 compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385",
46 "marvell,armada380"; 46 "marvell,armada380";
47};
47 48
48 soc { 49&expander0 {
49 internal-regs{ 50 #address-cells = <1>;
50 i2c@11000 { 51 #size-cells = <0>;
51
52 pca9635@68 {
53 #address-cells = <1>;
54 #size-cells = <0>;
55 52
56 wan_amber@0 { 53 wan_amber@0 {
57 label = "shelby:amber:wan"; 54 label = "shelby:amber:wan";
58 reg = <0x0>; 55 reg = <0x0>;
59 }; 56 };
60 57
61 wan_white@1 { 58 wan_white@1 {
62 label = "shelby:white:wan"; 59 label = "shelby:white:wan";
63 reg = <0x1>; 60 reg = <0x1>;
64 }; 61 };
65 62
66 wlan_2g@2 { 63 wlan_2g@2 {
67 label = "shelby:white:wlan_2g"; 64 label = "shelby:white:wlan_2g";
68 reg = <0x2>; 65 reg = <0x2>;
69 }; 66 };
70 67
71 wlan_5g@3 { 68 wlan_5g@3 {
72 label = "shelby:white:wlan_5g"; 69 label = "shelby:white:wlan_5g";
73 reg = <0x3>; 70 reg = <0x3>;
74 }; 71 };
75 72
76 usb2@5 { 73 usb2@5 {
77 label = "shelby:white:usb2"; 74 label = "shelby:white:usb2";
78 reg = <0x5>; 75 reg = <0x5>;
79 }; 76 };
80 77
81 usb3_1@6 { 78 usb3_1@6 {
82 label = "shelby:white:usb3_1"; 79 label = "shelby:white:usb3_1";
83 reg = <0x6>; 80 reg = <0x6>;
84 }; 81 };
85 82
86 usb3_2@7 { 83 usb3_2@7 {
87 label = "shelby:white:usb3_2"; 84 label = "shelby:white:usb3_2";
88 reg = <0x7>; 85 reg = <0x7>;
89 }; 86 };
90 87
91 wps_white@8 { 88 wps_white@8 {
92 label = "shelby:white:wps"; 89 label = "shelby:white:wps";
93 reg = <0x8>; 90 reg = <0x8>;
94 }; 91 };
95 92
96 wps_amber@9 { 93 wps_amber@9 {
97 label = "shelby:amber:wps"; 94 label = "shelby:amber:wps";
98 reg = <0x9>; 95 reg = <0x9>;
99 };
100 };
101 };
102 };
103 }; 96 };
97};
104 98
105 gpio-leds { 99&gpio_leds {
106 power { 100 power {
107 label = "shelby:white:power"; 101 label = "shelby:white:power";
108 }; 102 };
109 103
110 sata { 104 sata {
111 label = "shelby:white:sata"; 105 label = "shelby:white:sata";
112 };
113 }; 106 };
114}; 107};