arm64: a37xx: dts: Correct mpp definitions

This patch corrects below mpp definitions for armada 3720 DB board
and ESPRESSOBin board:
- "smi" pins group is added and "smi" function is set for eth0;
- Now pcie pins are used as gpio to implement PCIe function in
  hardware, so "pcie" group function is changed to "gpio".

Reviewed-on: http://vgitil04.il.marvell.com:8080/43287
Reviewed-by: Hua Jing <jinghua@marvell.com>
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stefan Roese <sr@denx.de>
Signed-off-by: Ken Ma <make@marvell.com>
Signed-off-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts
index 88baf33f6bbdbf9872af639d5f962614e1b573e9..52fc134bad0b4e1365407c6269a50807b3f86417 100644 (file)
--- a/arch/arm/dts/armada-3720-db.dts
+++ b/arch/arm/dts/armada-3720-db.dts
@@ -82,7 +82,7 @@
 
 &eth0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&rgmii_pins>;
+       pinctrl-0 = <&rgmii_pins>, <&smi_pins>;
        status = "okay";
        phy-mode = "rgmii";
 };

diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts
index 5d8d27ebd15f8831dc21d813da7e8dbe21b30986..4e70d885bc4c710722fe7ceafa0c9d0092b0ad71 100644 (file)
--- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -90,7 +90,7 @@
 &eth0 {
        status = "okay";
        pinctrl-names = "default";
-       pinctrl-0 = <&rgmii_pins>;
+       pinctrl-0 = <&rgmii_pins>, <&smi_pins>;
        phy-mode = "rgmii";
        phy_addr = <0x1>;
        fixed-link {

diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index d139a617a98c752bbb568a96ab36a16d3934c3f2..301f9eecc42b20b8a05b8302569ce02a1f85c978 100644 (file)
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -183,6 +183,11 @@
                                        function = "mii";
                                };
 
+                               smi_pins: smi-pins {
+                                       groups = "smi";
+                                       function = "smi";
+                               };
+
                                sdio_pins: sdio-pins {
                                        groups = "sdio_sb";
                                        function = "sdio";
@@ -190,7 +195,7 @@
 
                                pcie_pins: pcie-pins {
                                        groups = "pcie1";
-                                       function = "pcie";
+                                       function = "gpio";
                                };
                        };