leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2

Browse Source 
Commit d20f997b4d ("ARM: dts: am57xx-beagle-x15: Remove pinmux
configurations for erratum i869") fat fingered a change in which
basically replaced mmc2_pinctrl_default with mmc1_pinctrl_default. And
kernel dutifully reports conflict of usage.

[...]
pinctrl-single 4a003400.pinmux: pin 4a00376c.0 already requested by
4809c000.mmc; cannot claim for 480b4000.mmc
pinctrl-single 4a003400.pinmux: pin-219 (480b4000.mmc) status -22
pinctrl-single 4a003400.pinmux: could not request pin 219 (4a00376c.0)
from group mmc1_pins_default  on device pinctrl-single
omap_hsmmc 480b4000.mmc: Error applying setting, reverse things back
omap_hsmmc 480b4000.mmc: could not initialize pin control state
[...]

But, thanks to the fact that we were in fact setting all the muxes in
U-Boot, all the MMC devices were still properly detected.

Fix the typo.

Fixes: d20f997b4d ("ARM: dts: am57xx-beagle-x15: Remove pinmux
configurations for erratum i869")
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
[tony@atomide.com: removed timestamps and wrapped description]
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Nishanth Menon 2016-09-15 14:10:59 -05:00 committed by Tony Lindgren
parent a2a2b82156
commit 0574cb1439
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
View File

@ -451,7 +451,7 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_default>;
pinctrl-0 = <&mmc2_pins_default>;
vmmc-supply = <&vdd_3v3>;
bus-width = <8>;