diff options
| author | Ryan Press <ryan@presslab.us> | 2013-03-26 16:32:31 -0700 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-03-28 17:29:23 +0000 |
| commit | 879d68a445dd7073a8c022fcdd21dc27eca7f192 (patch) | |
| tree | f8ce9f7fc17ad47081158a6c8616632945abeea7 /arch | |
| parent | e0656a9cbbd0444aaec493ed8a9420d07c356639 (diff) | |
| download | linux-next-879d68a445dd7073a8c022fcdd21dc27eca7f192.tar.gz | |
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>
Diffstat (limited to 'arch')
| -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 @@ }; mvsdio@d00d4000 { - pinctrl-0 = <&sdio_pins2>; + pinctrl-0 = <&sdio_pins3>; pinctrl-names = "default"; status = "okay"; /* 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 @@ "mpp50", "mpp51", "mpp52"; marvell,function = "sd0"; }; + + sdio_pins3: sdio-pins3 { + marvell,pins = "mpp48", "mpp49", "mpp50", + "mpp51", "mpp52", "mpp53"; + marvell,function = "sd0"; + }; }; gpio0: gpio@d0018100 { |