Skip to content

Commit

Permalink
ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2
Browse files Browse the repository at this point in the history
Commit d20f997 ("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: d20f997 ("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>
  • Loading branch information
Nishanth Menon authored and Tony Lindgren committed Sep 15, 2016
1 parent a2a2b82 commit 0574cb1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
Expand Down

0 comments on commit 0574cb1

Please sign in to comment.