ARM: dts: socfgpa: remove ethernet aliases from dtsi

Not all boards use two ethernet devices and/or use them in different
order. As almost all in-tree boards already define their own ethernet
aliases, remove them from the dtsi and add the aliases to the two boards,
that are missing their own definition.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
[dinguyen@kernel.org: rebased to latest dts changes]
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index b3ff5a86efdb..2d300396f0ed 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -22,8 +22,6 @@
         #size-cells = <1>;
 
         aliases {
-                ethernet0 = &gmac0;
-                ethernet1 = &gmac1;
                 serial0 = &uart0;
                 serial1 = &uart1;
                 timer0 = &timer0;
diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts b/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts
index 6f5255a7d192..031c721441ff 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5_socrates.dts
@@ -21,6 +21,10 @@
         model = "EBV SOCrates";
         compatible = "ebv,socrates", "altr,socfpga-cyclone5", "altr,socfpga";
 
+        aliases {
+                ethernet0 = &gmac1;
+        };
+
         chosen {
                 bootargs = "earlyprintk";
                 stdout-path = "serial0:115200n8";