From: Mathias Kresin <dev@kresin.me>
Date: Thu, 30 Aug 2018 17:13:20 +0000 (+0200)
Subject: ramips: add mt7620/1 sdhci pinmux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8ec22b3de301705838bc18ec2c57566d6b8a3c92;p=openwrt%2Fstaging%2Fjow.git

ramips: add mt7620/1 sdhci pinmux

Set the pins to the required mode via the pinmux driver. It allows to
get rid of the pinmux related code in the sd card driver.

Signed-off-by: Mathias Kresin <dev@kresin.me>
(backported from 563a5b5f94b2fb36dce36f39bf6515e5bbb31245)
---

diff --git a/target/linux/ramips/dts/GB-PC1.dts b/target/linux/ramips/dts/GB-PC1.dts
index 71f6c4b5b2..996d7c8b50 100644
--- a/target/linux/ramips/dts/GB-PC1.dts
+++ b/target/linux/ramips/dts/GB-PC1.dts
@@ -60,9 +60,6 @@
 
 &sdhci {
 	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdhci_pins>;
 };
 
 &spi0 {
diff --git a/target/linux/ramips/dts/GB-PC2.dts b/target/linux/ramips/dts/GB-PC2.dts
index ae73115608..e275c1e071 100644
--- a/target/linux/ramips/dts/GB-PC2.dts
+++ b/target/linux/ramips/dts/GB-PC2.dts
@@ -71,9 +71,6 @@
 
 &sdhci {
 	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdhci_pins>;
 };
 
 &spi0 {
diff --git a/target/linux/ramips/dts/Newifi-D1.dts b/target/linux/ramips/dts/Newifi-D1.dts
index 1aebc1b7f6..772054f3d1 100644
--- a/target/linux/ramips/dts/Newifi-D1.dts
+++ b/target/linux/ramips/dts/Newifi-D1.dts
@@ -75,9 +75,6 @@
 
 &sdhci {
 	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdhci_pins>;
 };
 
 &spi0 {
diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts
index 537e5f208f..1f304a7f72 100644
--- a/target/linux/ramips/dts/PBR-M1.dts
+++ b/target/linux/ramips/dts/PBR-M1.dts
@@ -106,8 +106,6 @@
 
 &sdhci {
 	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdhci_pins>;
 };
 
 &spi0 {
diff --git a/target/linux/ramips/dts/Timecloud.dts b/target/linux/ramips/dts/Timecloud.dts
index 16f2326f5a..686e6da94d 100644
--- a/target/linux/ramips/dts/Timecloud.dts
+++ b/target/linux/ramips/dts/Timecloud.dts
@@ -57,9 +57,6 @@
 
 &sdhci {
 	status = "okay";
-
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdhci_pins>;
 };
 
 &spi0 {
diff --git a/target/linux/ramips/dts/U7621-06.dtsi b/target/linux/ramips/dts/U7621-06.dtsi
index b14cadf82b..80c129dfb7 100644
--- a/target/linux/ramips/dts/U7621-06.dtsi
+++ b/target/linux/ramips/dts/U7621-06.dtsi
@@ -96,8 +96,6 @@
 
 &sdhci {
 	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdhci_pins>;
 };
 
 &pcie {
diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi
index 8cb397cd22..a242684fd8 100644
--- a/target/linux/ramips/dts/mt7620a.dtsi
+++ b/target/linux/ramips/dts/mt7620a.dtsi
@@ -417,6 +417,13 @@
 				ralink,function = "pa";
 			};
 		};
+
+		sdhci_pins: sdhci {
+			sdhci {
+				ralink,group = "nd_sd";
+				ralink,function = "sd";
+			};
+		};
 	};
 
 	rstctrl: rstctrl {
@@ -496,6 +503,9 @@
 		interrupt-parent = <&intc>;
 		interrupts = <14>;
 
+		pinctrl-names = "default";
+		pinctrl-0 = <&sdhci_pins>;
+
 		status = "disabled";
 	};
 
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 31d930d225..9f22f04df2 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -341,6 +341,9 @@
 
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH>;
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&sdhci_pins>;
 	};
 
 	xhci: xhci@1E1C0000 {