diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-03-03 09:41:00 -0500 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2015-03-04 09:02:24 -0500 |
commit | 9574b2fb1cf7f6bab48714f5cf9e5382b8ca1685 (patch) | |
tree | 6eab402597ff508593cc97daadfdcc144822f75e | |
parent | 43e58e90f8f9c69a453b9889f66e4562eb99b32b (diff) |
ARM: mvebu: remove aliases for Ethernet devices on Armada 370/375/38x/XP
Having aliases for Ethernet devices is useless, since the networking
subsystem unfortunately doesn't care about aliases to name network
interfaces.
Note that the 'aliases' nodes in armada-370-xp.dtsi and armada-xp.dtsi
become empty, but that we keep it as is since a followup patch will
re-add some aliases to it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 1 |
6 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 8a322ad57e5f..d36b1e58b5b7 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi | |||
@@ -59,8 +59,6 @@ | |||
59 | compatible = "marvell,armada-370-xp"; | 59 | compatible = "marvell,armada-370-xp"; |
60 | 60 | ||
61 | aliases { | 61 | aliases { |
62 | eth0 = ð0; | ||
63 | eth1 = ð1; | ||
64 | }; | 62 | }; |
65 | 63 | ||
66 | cpus { | 64 | cpus { |
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 6307e80516dd..0d02251ede2f 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi | |||
@@ -60,8 +60,6 @@ | |||
60 | gpio0 = &gpio0; | 60 | gpio0 = &gpio0; |
61 | gpio1 = &gpio1; | 61 | gpio1 = &gpio1; |
62 | gpio2 = &gpio2; | 62 | gpio2 = &gpio2; |
63 | ethernet0 = ð0; | ||
64 | ethernet1 = ð1; | ||
65 | }; | 63 | }; |
66 | 64 | ||
67 | clocks { | 65 | clocks { |
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 2fedfc7d775d..f74bb01edb1b 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi | |||
@@ -59,9 +59,6 @@ | |||
59 | aliases { | 59 | aliases { |
60 | gpio0 = &gpio0; | 60 | gpio0 = &gpio0; |
61 | gpio1 = &gpio1; | 61 | gpio1 = &gpio1; |
62 | ethernet0 = ð0; | ||
63 | ethernet1 = ð1; | ||
64 | ethernet2 = ð2; | ||
65 | }; | 62 | }; |
66 | 63 | ||
67 | soc { | 64 | soc { |
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index 4a7cbed79b07..8479fdc9e9c2 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi | |||
@@ -57,7 +57,6 @@ | |||
57 | gpio0 = &gpio0; | 57 | gpio0 = &gpio0; |
58 | gpio1 = &gpio1; | 58 | gpio1 = &gpio1; |
59 | gpio2 = &gpio2; | 59 | gpio2 = &gpio2; |
60 | eth3 = ð3; | ||
61 | }; | 60 | }; |
62 | 61 | ||
63 | cpus { | 62 | cpus { |
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index 36ce63a96cc9..661d54c81580 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi | |||
@@ -57,7 +57,6 @@ | |||
57 | gpio0 = &gpio0; | 57 | gpio0 = &gpio0; |
58 | gpio1 = &gpio1; | 58 | gpio1 = &gpio1; |
59 | gpio2 = &gpio2; | 59 | gpio2 = &gpio2; |
60 | eth3 = ð3; | ||
61 | }; | 60 | }; |
62 | 61 | ||
63 | 62 | ||
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index 82917236a2fb..975ae64ead9e 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
@@ -57,7 +57,6 @@ | |||
57 | compatible = "marvell,armadaxp", "marvell,armada-370-xp"; | 57 | compatible = "marvell,armadaxp", "marvell,armada-370-xp"; |
58 | 58 | ||
59 | aliases { | 59 | aliases { |
60 | eth2 = ð2; | ||
61 | }; | 60 | }; |
62 | 61 | ||
63 | soc { | 62 | soc { |