You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From e59451432d7e0f7953e29c15e70111dfdbecc145 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
|
Date: Fri, 19 Sep 2014 21:24:34 +0200
|
|
Subject: ARM: mvebu: armada-xp: Move GE0/1 pinctrl settings for RGMII
|
|
|
|
Pinctrl settings for GE0 and GE1 are not only usable on RD-AXPWiFiAP.
|
|
Moreover, naming the RGMII settings pmx-ge{0,1} is not precise enough
|
|
as there is also a GMII setting for GE0.
|
|
|
|
Move the pinctrl sub-nodes to the common pinctrl node and rename them
|
|
to pmx-ge{0,1}-rgmii.
|
|
|
|
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
|
Tested-By: Benoit Masson <yahoo@perenite.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
|
|
@@ -84,14 +84,14 @@
|
|
};
|
|
|
|
ethernet@70000 {
|
|
- pinctrl-0 = <&pmx_ge0>;
|
|
+ pinctrl-0 = <&pmx_ge0_rgmii>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
phy = <&phy0>;
|
|
phy-mode = "rgmii-id";
|
|
};
|
|
ethernet@74000 {
|
|
- pinctrl-0 = <&pmx_ge1>;
|
|
+ pinctrl-0 = <&pmx_ge1_rgmii>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
phy = <&phy1>;
|
|
@@ -133,20 +133,6 @@
|
|
pinctrl-0 = <&pmx_phy_int>;
|
|
pinctrl-names = "default";
|
|
|
|
- pmx_ge0: pmx-ge0 {
|
|
- marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
|
|
- "mpp4", "mpp5", "mpp6", "mpp7",
|
|
- "mpp8", "mpp9", "mpp10", "mpp11";
|
|
- marvell,function = "ge0";
|
|
- };
|
|
-
|
|
- pmx_ge1: pmx-ge1 {
|
|
- marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
|
|
- "mpp16", "mpp17", "mpp18", "mpp19",
|
|
- "mpp20", "mpp21", "mpp22", "mpp23";
|
|
- marvell,function = "ge1";
|
|
- };
|
|
-
|
|
pmx_keys: pmx-keys {
|
|
marvell,pins = "mpp33";
|
|
marvell,function = "gpio";
|
|
--- a/arch/arm/boot/dts/armada-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-xp.dtsi
|
|
@@ -75,6 +75,22 @@
|
|
pinctrl: pin-ctrl@18000 {
|
|
reg = <0x18000 0x38>;
|
|
|
|
+ pmx_ge0_rgmii: pmx-ge0-rgmii {
|
|
+ marvell,pins =
|
|
+ "mpp0", "mpp1", "mpp2", "mpp3",
|
|
+ "mpp4", "mpp5", "mpp6", "mpp7",
|
|
+ "mpp8", "mpp9", "mpp10", "mpp11";
|
|
+ marvell,function = "ge0";
|
|
+ };
|
|
+
|
|
+ pmx_ge1_rgmii: pmx-ge1-rgmii {
|
|
+ marvell,pins =
|
|
+ "mpp12", "mpp13", "mpp14", "mpp15",
|
|
+ "mpp16", "mpp17", "mpp18", "mpp19",
|
|
+ "mpp20", "mpp21", "mpp22", "mpp23";
|
|
+ marvell,function = "ge1";
|
|
+ };
|
|
+
|
|
sdio_pins: sdio-pins {
|
|
marvell,pins = "mpp30", "mpp31", "mpp32",
|
|
"mpp33", "mpp34", "mpp35";
|