diff options
| author | Mathias Kresin <dev@kresin.me> | 2018-08-30 19:13:20 +0200 |
|---|---|---|
| committer | Mathias Kresin <dev@kresin.me> | 2018-09-06 21:35:53 +0200 |
| commit | 563a5b5f94b2fb36dce36f39bf6515e5bbb31245 (patch) | |
| tree | 3ff93ef2b068d074702d97fd13dbd761eda73604 | |
| parent | a14097e8e0eef8f7ee5e1e773defee83366a10a4 (diff) | |
| download | upstream-563a5b5f94b2fb36dce36f39bf6515e5bbb31245.tar.gz upstream-563a5b5f94b2fb36dce36f39bf6515e5bbb31245.tar.bz2 upstream-563a5b5f94b2fb36dce36f39bf6515e5bbb31245.zip | |
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>
| -rw-r--r-- | target/linux/ramips/dts/GB-PC1.dts | 3 | ||||
| -rw-r--r-- | target/linux/ramips/dts/GB-PC2.dts | 3 | ||||
| -rw-r--r-- | target/linux/ramips/dts/Newifi-D1.dts | 3 | ||||
| -rw-r--r-- | target/linux/ramips/dts/PBR-M1.dts | 2 | ||||
| -rw-r--r-- | target/linux/ramips/dts/Timecloud.dts | 3 | ||||
| -rw-r--r-- | target/linux/ramips/dts/U7621-06.dtsi | 2 | ||||
| -rw-r--r-- | target/linux/ramips/dts/mt7620a.dtsi | 10 | ||||
| -rw-r--r-- | target/linux/ramips/dts/mt7621.dtsi | 3 |
8 files changed, 13 insertions, 16 deletions
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 dcef40ff12..1e7f3b2ea4 100644 --- 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 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 9e5d8e0db3..641a225aeb 100644 --- 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 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 9a2cbbebc9..f3f47cdc92 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 { |