ARM: sun5i: A10s: Switch the EMAC pins indices

One of the pins group for the EMAC can be used by all the SoCs of the sun5i
family, and as such can be moved to the common DTSI.

Unfortunately, this group is the second one we declare in our DT for now.
Make it the first one so that it's more logical and consistent with the
rest of our DTs before moving it.

Acked-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index d8245c6314a7e8228e967e6b8014b01468029d45..9fbeb584abf5c2858a7937b62f38d8d6c8d00e84 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -83,7 +83,7 @@
 
 &emac {
        pinctrl-names = "default";
-       pinctrl-0 = <&emac_pins_a>;
+       pinctrl-0 = <&emac_pins_b>;
        phy = <&phy1>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index 2b8adda0dedad1d838db4471e2e03c50483d96c4..99c84e870d91e1cd66a3d3ab10a28d4f51b08314 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -95,7 +95,7 @@
 
 &emac {
        pinctrl-names = "default";
-       pinctrl-0 = <&emac_pins_b>;
+       pinctrl-0 = <&emac_pins_a>;
        phy = <&phy1>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 24b0f5f556f8a99ea3bd34fdc70b70213e06baa7..df2ba63d4ff9a2460a0676c0062af17a2117c24f 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -156,7 +156,7 @@
                function = "uart2";
        };
 
-       emac_pins_a: emac0@0 {
+       emac_pins_b: emac0@1 {
                pins = "PA0", "PA1", "PA2",
                                "PA3", "PA4", "PA5", "PA6",
                                "PA7", "PA8", "PA9", "PA10",
@@ -165,7 +165,7 @@
                function = "emac";
        };
 
-       emac_pins_b: emac0@1 {
+       emac_pins_a: emac0@0 {
                pins = "PD6", "PD7", "PD10",
                                "PD11", "PD12", "PD13", "PD14",
                                "PD15", "PD18", "PD19", "PD20",