Revert "arm64: a37xx: dts: Add pin control nodes to DT"

[u-boot] / arch / arm / dts / armada-37xx.dtsi

diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index 690234234b5e3e47ab5173e2bd744131d727a8c0..9fc87c9272315334c5b2826efe57b4d0984ee837 100644 (file)
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -46,6 +46,7 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/comphy/comphy_data.h>
+#include <dt-bindings/gpio/gpio.h>
 
 / {
        model = "Marvell Armada 37xx SoC";
@@ -154,6 +155,11 @@
                                        groups = "uart2";
                                        function = "uart";
                                };
+
+                               mmc_pins: mmc-pins {
+                                       groups = "emmc_nb";
+                                       function = "emmc";
+                               };
                        };
 
                        pinctrl_sb: pinctrl-sb@18800 {
@@ -162,7 +168,7 @@
                                reg = <0x18800 0x100>, <0x18C00 0x20>;
                                gpiosb: gpiosb {
                                        #gpio-cells = <2>;
-                                       gpio-ranges = <&pinctrl_sb 0 0 29>;
+                                       gpio-ranges = <&pinctrl_sb 0 0 30>;
                                        gpio-controller;
                                        interrupts =
                                        <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
@@ -177,6 +183,20 @@
                                        function = "mii";
                                };
 
+                               smi_pins: smi-pins {
+                                       groups = "smi";
+                                       function = "smi";
+                               };
+
+                               sdio_pins: sdio-pins {
+                                       groups = "sdio_sb";
+                                       function = "sdio";
+                               };
+
+                               pcie_pins: pcie-pins {
+                                       groups = "pcie1";
+                                       function = "gpio";
+                               };
                        };
 
                        usb3: usb@58000 {
@@ -266,20 +286,6 @@
                                status = "disabled";
                        };
 
-                       pinctl0: pinctl@13830 { /* north bridge */
-                               compatible = "marvell,armada-3700-pinctl";
-                               bank-name = "armada-3700-nb";
-                               reg = <0x13830 0x4>;
-                               pin-count = <36>;
-                       };
-
-                       pinctl1: pinctl@18830 { /* south bridge */
-                               compatible = "marvell,armada-3700-pinctl";
-                               bank-name = "armada-3700-sb";
-                               reg = <0x18830 0x4>;
-                               pin-count = <30>;
-                       };
-
                        comphy: comphy@18300 {
                                compatible = "marvell,mvebu-comphy", "marvell,comphy-armada-3700";
                                reg = <0x18300 0x28>,