Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: mvebu: update Ethernet compatible string for Armada XP

This patch updates the Ethernet DT nodes for Armada XP SoCs with the
compatible string "marvell,armada-xp-neta".

Signed-off-by: Simon Guinot <simon.guinot@sequanux.org>
Fixes: 77916519cba3 ("arm: mvebu: Armada XP MV78230 has only three Ethernet interfaces")
Cc: <stable@vger.kernel.org> # v3.8+
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Simon Guinot and committed by
David S. Miller
ea3b55fe f522a975

+19 -5
-2
arch/arm/boot/dts/armada-370-xp.dtsi
··· 270 270 }; 271 271 272 272 eth0: ethernet@70000 { 273 - compatible = "marvell,armada-370-neta"; 274 273 reg = <0x70000 0x4000>; 275 274 interrupts = <8>; 276 275 clocks = <&gateclk 4>; ··· 285 286 }; 286 287 287 288 eth1: ethernet@74000 { 288 - compatible = "marvell,armada-370-neta"; 289 289 reg = <0x74000 0x4000>; 290 290 interrupts = <10>; 291 291 clocks = <&gateclk 3>;
+8
arch/arm/boot/dts/armada-370.dtsi
··· 307 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 };
+1 -1
arch/arm/boot/dts/armada-xp-mv78260.dtsi
··· 318 318 }; 319 319 320 320 eth3: ethernet@34000 { 321 - compatible = "marvell,armada-370-neta"; 321 + compatible = "marvell,armada-xp-neta"; 322 322 reg = <0x34000 0x4000>; 323 323 interrupts = <14>; 324 324 clocks = <&gateclk 1>;
+1 -1
arch/arm/boot/dts/armada-xp-mv78460.dtsi
··· 356 356 }; 357 357 358 358 eth3: ethernet@34000 { 359 - compatible = "marvell,armada-370-neta"; 359 + compatible = "marvell,armada-xp-neta"; 360 360 reg = <0x34000 0x4000>; 361 361 interrupts = <14>; 362 362 clocks = <&gateclk 1>;
+9 -1
arch/arm/boot/dts/armada-xp.dtsi
··· 177 177 }; 178 178 179 179 eth2: ethernet@30000 { 180 - compatible = "marvell,armada-370-neta"; 180 + compatible = "marvell,armada-xp-neta"; 181 181 reg = <0x30000 0x4000>; 182 182 interrupts = <12>; 183 183 clocks = <&gateclk 2>; ··· 218 218 dmacap,xor; 219 219 dmacap,memset; 220 220 }; 221 + }; 222 + 223 + ethernet@70000 { 224 + compatible = "marvell,armada-xp-neta"; 225 + }; 226 + 227 + ethernet@74000 { 228 + compatible = "marvell,armada-xp-neta"; 221 229 }; 222 230 223 231 xor@f0900 {