aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-24 20:27:34 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-24 20:27:34 -0500
commit4d8880a0ee5b3cdf7927c6cf59a164f352e4f436 (patch)
treeb11c4af3b283f4850da11f4be856b7a432375720 /arch/arm
parent8e585a6c4abdef8562308f3f307aeea6cf168e8b (diff)
parente48ca29d30a10556eb7abd8d91980b8a57dabf10 (diff)
Merge tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: - Add new documents with guidelines for DT binding stability and review process. This is one of the outcomes of Kernel Summit DT discussions - Remove a bunch of device_type usage which is only for OF and deprecated with FDT - Fix a long standing issue with compatible string match ordering - Various minor binding documentation updates * tag 'devicetree-for-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: add rockchip vendor prefix serial: vt8500: Add missing binding document for arch-vt8500 serial driver. dt/bindings: submitting patches and ABI documents DT: Add vendor prefix for Emerging Display Technologies of: add vendor prefixe for EPFL of: add vendor prefix for Gumstix of: add vendor prefix for Ka-Ro electronics GmbH devicetree: macb: Document clock properties dts: bindings: trivial clock bindings doc fixes of: Fix __of_device_is_available check dt/bindings: Remove device_type "serial" from marvell,mv64360-mpsc dt/bindings: remove device_type "network" references dt/bindings: remove users of device_type "mdio" dt/bindings: Remove references to linux,phandle properties dt/bindings: Remove all references to device_type "ethernet-phy" of: irq: Ignore disabled intc's when searching map of: irq: Ignore disabled interrupt controllers OF: base: match each node compatible against all given matches first dt-bindings: add GIC-400 binding
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/dove.dtsi2
-rw-r--r--arch/arm/boot/dts/kirkwood-cloudbox.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-db.dtsi1
-rw-r--r--arch/arm/boot/dts/kirkwood-dnskw.dtsi1
-rw-r--r--arch/arm/boot/dts/kirkwood-dockstar.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-dreamplug.dts2
-rw-r--r--arch/arm/boot/dts/kirkwood-goflexnet.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts2
-rw-r--r--arch/arm/boot/dts/kirkwood-ib62x0.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-iconnect.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-km_kirkwood.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-lsxl.dtsi2
-rw-r--r--arch/arm/boot/dts/kirkwood-mplcec4.dts2
-rw-r--r--arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-ns2-common.dtsi1
-rw-r--r--arch/arm/boot/dts/kirkwood-openblocks_a6.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-openblocks_a7.dts2
-rw-r--r--arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi1
-rw-r--r--arch/arm/boot/dts/kirkwood-topkick.dts1
-rw-r--r--arch/arm/boot/dts/kirkwood-ts219.dtsi1
-rw-r--r--arch/arm/boot/dts/kirkwood.dtsi2
-rw-r--r--arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts1
-rw-r--r--arch/arm/boot/dts/orion5x.dtsi1
24 files changed, 0 insertions, 31 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 8de1031233ae..2b76524f4aa7 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -296,7 +296,6 @@
296 status = "disabled"; 296 status = "disabled";
297 297
298 ethernet-port@0 { 298 ethernet-port@0 {
299 device_type = "network";
300 compatible = "marvell,orion-eth-port"; 299 compatible = "marvell,orion-eth-port";
301 reg = <0>; 300 reg = <0>;
302 interrupts = <29>; 301 interrupts = <29>;
@@ -316,7 +315,6 @@
316 status = "disabled"; 315 status = "disabled";
317 316
318 ethphy: ethernet-phy { 317 ethphy: ethernet-phy {
319 device_type = "ethernet-phy";
320 /* set phy address in board file */ 318 /* set phy address in board file */
321 }; 319 };
322 }; 320 };
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index bb4df405527c..0e06fd3cee4d 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -94,7 +94,6 @@
94 status = "okay"; 94 status = "okay";
95 95
96 ethphy0: ethernet-phy@0 { 96 ethphy0: ethernet-phy@0 {
97 device_type = "ethernet-phy";
98 reg = <0>; 97 reg = <0>;
99 }; 98 };
100}; 99};
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index afebc1570318..02d1225ef99f 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -84,7 +84,6 @@
84 status = "okay"; 84 status = "okay";
85 85
86 ethphy0: ethernet-phy@8 { 86 ethphy0: ethernet-phy@8 {
87 device_type = "ethernet-phy";
88 reg = <8>; 87 reg = <8>;
89 }; 88 };
90}; 89};
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index 12087566ac6d..d5aa9564a287 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -224,7 +224,6 @@
224 status = "okay"; 224 status = "okay";
225 225
226 ethphy0: ethernet-phy@8 { 226 ethphy0: ethernet-phy@8 {
227 device_type = "ethernet-phy";
228 reg = <8>; 227 reg = <8>;
229 }; 228 };
230}; 229};
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
index 2a41c75c5c21..f31312ebd0d6 100644
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -95,7 +95,6 @@
95 status = "okay"; 95 status = "okay";
96 96
97 ethphy0: ethernet-phy@0 { 97 ethphy0: ethernet-phy@0 {
98 device_type = "ethernet-phy";
99 compatible = "marvell,88e1116"; 98 compatible = "marvell,88e1116";
100 reg = <0>; 99 reg = <0>;
101 }; 100 };
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index a7558375e06f..ef3463e0ae19 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -104,12 +104,10 @@
104 status = "okay"; 104 status = "okay";
105 105
106 ethphy0: ethernet-phy@0 { 106 ethphy0: ethernet-phy@0 {
107 device_type = "ethernet-phy";
108 reg = <0>; 107 reg = <0>;
109 }; 108 };
110 109
111 ethphy1: ethernet-phy@1 { 110 ethphy1: ethernet-phy@1 {
112 device_type = "ethernet-phy";
113 reg = <1>; 111 reg = <1>;
114 }; 112 };
115}; 113};
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index c2e512953570..eb9329420107 100644
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -176,7 +176,6 @@
176 status = "okay"; 176 status = "okay";
177 177
178 ethphy0: ethernet-phy@0 { 178 ethphy0: ethernet-phy@0 {
179 device_type = "ethernet-phy";
180 reg = <0>; 179 reg = <0>;
181 }; 180 };
182}; 181};
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 0b557d5cb723..2d51fce74a5a 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -101,13 +101,11 @@
101 status = "okay"; 101 status = "okay";
102 102
103 ethphy0: ethernet-phy@0 { 103 ethphy0: ethernet-phy@0 {
104 device_type = "ethernet-phy";
105 compatible = "marvell,88e1121"; 104 compatible = "marvell,88e1121";
106 reg = <0>; 105 reg = <0>;
107 }; 106 };
108 107
109 ethphy1: ethernet-phy@1 { 108 ethphy1: ethernet-phy@1 {
110 device_type = "ethernet-phy";
111 compatible = "marvell,88e1121"; 109 compatible = "marvell,88e1121";
112 reg = <1>; 110 reg = <1>;
113 }; 111 };
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 6ccc78866e6d..a1add3f215e3 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -133,7 +133,6 @@
133 status = "okay"; 133 status = "okay";
134 134
135 ethphy0: ethernet-phy@8 { 135 ethphy0: ethernet-phy@8 {
136 device_type = "ethernet-phy";
137 reg = <8>; 136 reg = <8>;
138 }; 137 };
139}; 138};
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index f7636291de77..8d8c80e3656d 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -183,7 +183,6 @@
183 status = "okay"; 183 status = "okay";
184 184
185 ethphy0: ethernet-phy@11 { 185 ethphy0: ethernet-phy@11 {
186 device_type = "ethernet-phy";
187 reg = <11>; 186 reg = <11>;
188 }; 187 };
189}; 188};
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index 589000631b5a..59e7a5adeedb 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -200,7 +200,6 @@
200 status = "okay"; 200 status = "okay";
201 201
202 ethphy1: ethernet-phy@11 { 202 ethphy1: ethernet-phy@11 {
203 device_type = "ethernet-phy";
204 reg = <11>; 203 reg = <11>;
205 }; 204 };
206}; 205};
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index 5b5808ebc6e0..04a1e44541b3 100644
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -55,7 +55,6 @@
55 status = "okay"; 55 status = "okay";
56 56
57 ethphy0: ethernet-phy@0 { 57 ethphy0: ethernet-phy@0 {
58 device_type = "ethernet-phy";
59 reg = <0>; 58 reg = <0>;
60 }; 59 };
61}; 60};
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index fc1cd3b7b968..1656653d339b 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -212,12 +212,10 @@
212 status = "okay"; 212 status = "okay";
213 213
214 ethphy0: ethernet-phy@0 { 214 ethphy0: ethernet-phy@0 {
215 device_type = "ethernet-phy";
216 reg = <0>; 215 reg = <0>;
217 }; 216 };
218 217
219 ethphy1: ethernet-phy@8 { 218 ethphy1: ethernet-phy@8 {
220 device_type = "ethernet-phy";
221 reg = <8>; 219 reg = <8>;
222 }; 220 };
223}; 221};
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index c20607cd7d7c..73722c067501 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -197,12 +197,10 @@
197 status = "okay"; 197 status = "okay";
198 198
199 ethphy0: ethernet-phy@1 { 199 ethphy0: ethernet-phy@1 {
200 device_type = "ethernet-phy";
201 reg = <1>; 200 reg = <1>;
202 }; 201 };
203 202
204 ethphy1: ethernet-phy@2 { 203 ethphy1: ethernet-phy@2 {
205 device_type = "ethernet-phy";
206 reg = <2>; 204 reg = <2>;
207 }; 205 };
208}; 206};
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index 4d2a8db9ab77..4838478019cc 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -242,7 +242,6 @@
242 status = "okay"; 242 status = "okay";
243 243
244 ethphy0: ethernet-phy@0 { /* Marvell 88E1318 */ 244 ethphy0: ethernet-phy@0 { /* Marvell 88E1318 */
245 device_type = "ethernet-phy";
246 reg = <0>; 245 reg = <0>;
247 }; 246 };
248}; 247};
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index ae1ccbe41029..743152f31a81 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -89,7 +89,6 @@
89 status = "okay"; 89 status = "okay";
90 90
91 ethphy0: ethernet-phy { 91 ethphy0: ethernet-phy {
92 device_type = "ethernet-phy";
93 /* overwrite reg property in board file */ 92 /* overwrite reg property in board file */
94 }; 93 };
95}; 94};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 5c6a4f1b4e93..b88da9392c32 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -171,7 +171,6 @@
171 status = "okay"; 171 status = "okay";
172 172
173 ethphy0: ethernet-phy@0 { 173 ethphy0: ethernet-phy@0 {
174 device_type = "ethernet-phy";
175 reg = <0>; 174 reg = <0>;
176 }; 175 };
177}; 176};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index c054ef61cff5..b2f7cae06839 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -196,12 +196,10 @@
196 status = "okay"; 196 status = "okay";
197 197
198 ethphy0: ethernet-phy@0 { 198 ethphy0: ethernet-phy@0 {
199 device_type = "ethernet-phy";
200 reg = <0>; 199 reg = <0>;
201 }; 200 };
202 201
203 ethphy1: ethernet-phy@1 { 202 ethphy1: ethernet-phy@1 {
204 device_type = "ethernet-phy";
205 reg = <1>; 203 reg = <1>;
206 }; 204 };
207}; 205};
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index 7b1cd993e891..1ff848d570a9 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -96,7 +96,6 @@
96 status = "okay"; 96 status = "okay";
97 97
98 ethphy0: ethernet-phy@0 { 98 ethphy0: ethernet-phy@0 {
99 device_type = "ethernet-phy";
100 reg = <0>; 99 reg = <0>;
101 }; 100 };
102}; 101};
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 40d6adf678ca..5fc817c2cb87 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -208,7 +208,6 @@
208 status = "okay"; 208 status = "okay";
209 209
210 ethphy0: ethernet-phy@0 { 210 ethphy0: ethernet-phy@0 {
211 device_type = "ethernet-phy";
212 reg = <0>; 211 reg = <0>;
213 }; 212 };
214}; 213};
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 39158cf16258..911f3a8cee23 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -104,7 +104,6 @@
104 status = "okay"; 104 status = "okay";
105 105
106 ethphy0: ethernet-phy { 106 ethphy0: ethernet-phy {
107 device_type = "ethernet-phy";
108 /* overwrite reg property in board file */ 107 /* overwrite reg property in board file */
109 }; 108 };
110}; 109};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 81e6c409284e..6abf44d257df 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -243,7 +243,6 @@
243 status = "disabled"; 243 status = "disabled";
244 244
245 ethernet0-port@0 { 245 ethernet0-port@0 {
246 device_type = "network";
247 compatible = "marvell,kirkwood-eth-port"; 246 compatible = "marvell,kirkwood-eth-port";
248 reg = <0>; 247 reg = <0>;
249 interrupts = <11>; 248 interrupts = <11>;
@@ -275,7 +274,6 @@
275 status = "disabled"; 274 status = "disabled";
276 275
277 ethernet1-port@0 { 276 ethernet1-port@0 {
278 device_type = "network";
279 compatible = "marvell,kirkwood-eth-port"; 277 compatible = "marvell,kirkwood-eth-port";
280 reg = <0>; 278 reg = <0>;
281 interrupts = <15>; 279 interrupts = <15>;
diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
index fcc5bb63f03a..5ed6c1376901 100644
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -58,7 +58,6 @@
58 status = "okay"; 58 status = "okay";
59 59
60 ethphy: ethernet-phy { 60 ethphy: ethernet-phy {
61 device_type = "ethernet-phy";
62 reg = <8>; 61 reg = <8>;
63 }; 62 };
64}; 63};
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 9f51538cd9ef..174d89241f70 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -120,7 +120,6 @@
120 status = "disabled"; 120 status = "disabled";
121 121
122 ethernet-port@0 { 122 ethernet-port@0 {
123 device_type = "network";
124 compatible = "marvell,orion-eth-port"; 123 compatible = "marvell,orion-eth-port";
125 reg = <0>; 124 reg = <0>;
126 /* overwrite MAC address in bootloader */ 125 /* overwrite MAC address in bootloader */
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-05 11:30:15 -0500