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>

diff --git a/target/linux/ramips/dts/GB-PC1.dts b/target/linux/ramips/dts/GB-PC1.dts
index 71f6c4b5b26ed35a2843b846f989bf100df1fd24..996d7c8b50711e43566f57595a00d2c483191e9f 100644 (file)
--- 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 dcef40ff12b6b8e64f2a86b7f9ff266b7212c4e6..1e7f3b2ea42fa8d802b943724ccd203739aeca20 100644 (file)
--- a/target/linux/ramips/dts/GB-PC2.dts
+++ b/target/linux/ramips/dts/GB-PC2.dts
@@ -70,9 +70,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 1aebc1b7f6e87032710015d7619546792f7b485b..772054f3d1aeec8c8192546a6c7a476b76be2b51 100644 (file)
--- 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 537e5f208fe658e3226c5fe52f981195655de794..1f304a7f7223c86b05262d02d1d351b6bdc43e3c 100644 (file)
--- 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 9e5d8e0db39ee7edc86ed00396a43ea5e7801a51..641a225aeb36b099ad97e12b46676c62086b0663 100644 (file)
--- a/target/linux/ramips/dts/Timecloud.dts
+++ b/target/linux/ramips/dts/Timecloud.dts
@@ -56,9 +56,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 b14cadf82b96d857cbbbadbc0e903dec8a79f5b9..80c129dfb7c8fa3bf97bb0554eeebf8e4c92176f 100644 (file)
--- 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 8cb397cd22faf6b3ed24c4efb12e7492f673c2e6..a242684fd891ede36c55aef792b26a0edd52107b 100644 (file)
--- 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 9a2cbbebc9678da7e600f1bb1411df7a88e25ac1..f3f47cdc9227134482503656c9ae4f3b778c2a83 100644 (file)
--- 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 {