ARM: dts: kirkwood: set default pinctrl for GBE1

On Kirkwood, there is only one valid pinctrl setting for GBE1. With
a common SoC pinctrl node, we can now set it in the node instead of
in each board file.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-9-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 1a7f18d5530d5f27347209be755442f7593725cc..622a3ca12c2d758ef2917f020e64e689a40973d3 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -207,8 +207,6 @@
 
 &eth1 {
        status = "okay";
-       pinctrl-0 = <&pmx_ge1>;
-       pinctrl-names = "default";
        ethernet1-port@0 {
                phy-handle = <&ethphy1>;
        };

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 5d412e71b9fb89176902b989f18d3564e18cbcfe..fff28b71b474f587fe82887e912f24a845b827f5 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -320,6 +320,8 @@
                        reg = <0x76000 0x4000>;
                        clocks = <&gate_clk 19>;
                        marvell,tx-checksum-limit = <1600>;
+                       pinctrl-0 = <&pmx_ge1>;
+                       pinctrl-names = "default";
                        status = "disabled";
 
                        ethernet1-port@0 {