From: Mathias Kresin <dev@kresin.me>
Date: Fri, 31 Aug 2018 05:53:42 +0000 (+0200)
Subject: ramips: fix mt7620a ND/SD pins pinmuxes
X-Git-Tag: v19.07.0-rc1~2644
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=a14097e8e0eef8f7ee5e1e773defee83366a10a4;p=openwrt%2Fopenwrt.git

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 8eddbecd70..613a20f995 100644
--- 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 096a82513e..674ce23cbc 100644
--- 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 6dca2bfe1c..0aca63eb5b 100644
--- 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 5d67ad3a96..ffeee7ad22 100644
--- 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";
 		};
 	};