diff options
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78460.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 10 |
5 files changed, 19 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index ec96f0b36346..06a2f2ae9d1e 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -270,7 +270,6 @@ | |||
270 | }; | 270 | }; |
271 | 271 | ||
272 | eth0: ethernet@70000 { | 272 | eth0: ethernet@70000 { |
273 | compatible = "marvell,armada-370-neta"; | ||
274 | reg = <0x70000 0x4000>; | 273 | reg = <0x70000 0x4000>; |
275 | interrupts = <8>; | 274 | interrupts = <8>; |
276 | clocks = <&gateclk 4>; | 275 | clocks = <&gateclk 4>; |
@@ -286,7 +285,6 @@ | |||
286 | }; | 285 | }; |
287 | 286 | ||
288 | eth1: ethernet@74000 { | 287 | eth1: ethernet@74000 { |
289 | compatible = "marvell,armada-370-neta"; | ||
290 | reg = <0x74000 0x4000>; | 288 | reg = <0x74000 0x4000>; |
291 | interrupts = <10>; | 289 | interrupts = <10>; |
292 | clocks = <&gateclk 3>; | 290 | clocks = <&gateclk 3>; |
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 00b50db57c9c..ca4257b2f77d 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
@@ -307,6 +307,14 @@ | |||
307 | dmacap,memset; | 307 | dmacap,memset; |
308 | }; | 308 | }; |
309 | }; | 309 | }; |
310 | |||
311 | ethernet@70000 { | ||
312 | compatible = "marvell,armada-370-neta"; | ||
313 | }; | ||
314 | |||
315 | ethernet@74000 { | ||
316 | compatible = "marvell,armada-370-neta"; | ||
317 | }; | ||
310 | }; | 318 | }; |
311 | }; | 319 | }; |
312 | }; | 320 | }; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 8479fdc9e9c2..c5fdc99f0dbe 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
@@ -318,7 +318,7 @@ | |||
318 | }; | 318 | }; |
319 | 319 | ||
320 | eth3: ethernet@34000 { | 320 | eth3: ethernet@34000 { |
321 | compatible = "marvell,armada-370-neta"; | 321 | compatible = "marvell,armada-xp-neta"; |
322 | reg = <0x34000 0x4000>; | 322 | reg = <0x34000 0x4000>; |
323 | interrupts = <14>; | 323 | interrupts = <14>; |
324 | clocks = <&gateclk 1>; | 324 | clocks = <&gateclk 1>; |
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index 661d54c81580..0e24f1a38540 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
@@ -356,7 +356,7 @@ | |||
356 | }; | 356 | }; |
357 | 357 | ||
358 | eth3: ethernet@34000 { | 358 | eth3: ethernet@34000 { |
359 | compatible = "marvell,armada-370-neta"; | 359 | compatible = "marvell,armada-xp-neta"; |
360 | reg = <0x34000 0x4000>; | 360 | reg = <0x34000 0x4000>; |
361 | interrupts = <14>; | 361 | interrupts = <14>; |
362 | clocks = <&gateclk 1>; | 362 | clocks = <&gateclk 1>; |
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 013d63f69e36..8fdd6d7c0ab1 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -177,7 +177,7 @@ | |||
177 | }; | 177 | }; |
178 | 178 | ||
179 | eth2: ethernet@30000 { | 179 | eth2: ethernet@30000 { |
180 | compatible = "marvell,armada-370-neta"; | 180 | compatible = "marvell,armada-xp-neta"; |
181 | reg = <0x30000 0x4000>; | 181 | reg = <0x30000 0x4000>; |
182 | interrupts = <12>; | 182 | interrupts = <12>; |
183 | clocks = <&gateclk 2>; | 183 | clocks = <&gateclk 2>; |
@@ -220,6 +220,14 @@ | |||
220 | }; | 220 | }; |
221 | }; | 221 | }; |
222 | 222 | ||
223 | ethernet@70000 { | ||
224 | compatible = "marvell,armada-xp-neta"; | ||
225 | }; | ||
226 | |||
227 | ethernet@74000 { | ||
228 | compatible = "marvell,armada-xp-neta"; | ||
229 | }; | ||
230 | |||
223 | xor@f0900 { | 231 | xor@f0900 { |
224 | compatible = "marvell,orion-xor"; | 232 | compatible = "marvell,orion-xor"; |
225 | reg = <0xF0900 0x100 | 233 | reg = <0xF0900 0x100 |