diff options
| author | Nishanth Menon <nm@ti.com> | 2016-09-15 21:10:59 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-09-15 22:58:46 +0200 |
| commit | 0574cb14398c312f4eaea8d518c63ce62f20ecbc (patch) | |
| tree | b3838a22050ab5d2773d0ef53b01d3731a12e2ad /arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | |
| parent | Merge branch 'am335x-cpufreq-regression' into omap-for-v4.9/dt-v2 (diff) | |
| download | linux-0574cb14398c312f4eaea8d518c63ce62f20ecbc.tar.xz linux-0574cb14398c312f4eaea8d518c63ce62f20ecbc.zip | |
ARM: dts: am57xx-beagle-x15-common: Fix wrong pinctrl selection for mmc2
Commit d20f997b4d1f ("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: d20f997b4d1f ("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>
Diffstat (limited to 'arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi index ec85ff9004e8..6df7829a2c15 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi @@ -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>; |