diff options
| author | Ryan Press <ryan@presslab.us> | 2013-03-26 19:32:31 -0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-03-28 13:29:23 -0400 |
| commit | 879d68a445dd7073a8c022fcdd21dc27eca7f192 (patch) | |
| tree | f8ce9f7fc17ad47081158a6c8616632945abeea7 | |
| parent | e0656a9cbbd0444aaec493ed8a9420d07c356639 (diff) | |
arm: mvebu: Fix pinctrl for Armada 370 Mirabox SDIO port.
The previous configuration used the wrong "clk" pin. Without this
change mv_sdio worked because the bootloader would set the pin up, but
with a bootloader that does not set the pin, mv_sdio fails to detect any
card.
I have tested this change using a mwifiex_sdio wireless network adapter
over the SDIO interface.
Signed-off-by: Ryan Press <ryan@presslab.us>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/boot/dts/armada-370-mirabox.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index dd0c57dd9f30..3234875824dc 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | mvsdio@d00d4000 { | 56 | mvsdio@d00d4000 { |
| 57 | pinctrl-0 = <&sdio_pins2>; | 57 | pinctrl-0 = <&sdio_pins3>; |
| 58 | pinctrl-names = "default"; | 58 | pinctrl-names = "default"; |
| 59 | status = "okay"; | 59 | status = "okay"; |
| 60 | /* | 60 | /* |
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 8188d138020e..a195debb67d3 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi | |||
| @@ -59,6 +59,12 @@ | |||
| 59 | "mpp50", "mpp51", "mpp52"; | 59 | "mpp50", "mpp51", "mpp52"; |
| 60 | marvell,function = "sd0"; | 60 | marvell,function = "sd0"; |
| 61 | }; | 61 | }; |
| 62 | |||
| 63 | sdio_pins3: sdio-pins3 { | ||
| 64 | marvell,pins = "mpp48", "mpp49", "mpp50", | ||
| 65 | "mpp51", "mpp52", "mpp53"; | ||
| 66 | marvell,function = "sd0"; | ||
| 67 | }; | ||
| 62 | }; | 68 | }; |
| 63 | 69 | ||
| 64 | gpio0: gpio@d0018100 { | 70 | gpio0: gpio@d0018100 { |
