ramips: fix mt7620a ND/SD pins pinmuxes

Drop the nd_sd gpio pinmux in case sdcard is used. They're mutually
exclusive and for most of the boards not even used as GPIOs.

If the pins are in sdcard mode, the pins ND_WE_N and ND_CS_N are still
GPIOs (#45 and #46).

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ramips/dts/D240.dts b/target/linux/ramips/dts/D240.dts
index 8eddbecd7066fb9a771b58b76dd82abbdcab37e7..613a20f99530add0d5d8c9ac46ec1001ea19427c 100644 (file)
--- a/target/linux/ramips/dts/D240.dts
+++ b/target/linux/ramips/dts/D240.dts
@@ -173,7 +173,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                default {
-                       ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa", "nd_sd";
+                       ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
                        ralink,function = "gpio";
                };
        };

diff --git a/target/linux/ramips/dts/HC5X61.dtsi b/target/linux/ramips/dts/HC5X61.dtsi
index 096a82513eef53221d3464b861fe36efc4a6c75c..674ce23cbca84885e024ff7420f7472874f5cece 100644 (file)
--- a/target/linux/ramips/dts/HC5X61.dtsi
+++ b/target/linux/ramips/dts/HC5X61.dtsi
@@ -135,7 +135,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                gpio {
-                       ralink,group = "uartf", "wled", "nd_sd";
+                       ralink,group = "uartf", "wled";
                        ralink,function = "gpio";
                };
        };

diff --git a/target/linux/ramips/dts/OY-0001.dts b/target/linux/ramips/dts/OY-0001.dts
index 6dca2bfe1c4a27d8131c36a0f04e1c26f5fe66c2..0aca63eb5b676ec8ac2f2f05a5285c16f448dc18 100644 (file)
--- a/target/linux/ramips/dts/OY-0001.dts
+++ b/target/linux/ramips/dts/OY-0001.dts
@@ -93,7 +93,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                gpio {
-                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
+                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled";
                        ralink,function = "gpio";
                };
        };

diff --git a/target/linux/ramips/dts/ZTE-Q7.dts b/target/linux/ramips/dts/ZTE-Q7.dts
index 5d67ad3a96a347cb16a0a771b02b7dcb36b3e7e9..ffeee7ad228ab981ffb7d2e0f28e23a115a64e55 100644 (file)
--- a/target/linux/ramips/dts/ZTE-Q7.dts
+++ b/target/linux/ramips/dts/ZTE-Q7.dts
@@ -89,7 +89,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                gpio {
-                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
+                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled";
                        ralink,function = "gpio";
                };
        };