diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-07-08 15:15:22 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-14 11:15:57 +0200 |
| commit | 1d8aca9df612f5751892fb2642d72536f2f48fd0 (patch) | |
| tree | f4e66a320261ae1401fcb2f34a616ada1ce204ab /arch/arm/boot/dts/ste-href.dtsi | |
| parent | 109978dea44e8416524e69f0e8888810fdf6e72c (diff) | |
| download | talos-op-linux-1d8aca9df612f5751892fb2642d72536f2f48fd0.tar.gz talos-op-linux-1d8aca9df612f5751892fb2642d72536f2f48fd0.zip | |
ARM: ux500: fix MMC/SD card regression
Ux500 is regressing due to commit
a21763a0b1e5a5ab8310f581886d04beadc16616
"pinctrl: nomadik: activate strict mux mode" which disallows
Nomadik GPIO 5 to be muxed in as a level shifter voltage select
pin, as it is currently described as being used for RX on UART1.
The behaviour is correct, instead the hardware config has been
incorrecly specified: UART1 is indeed unused on HREFv60plus and
Snowball and that is why HREFv60plus can use the pins it would
normally occupy as the voltage select line for the MMC/SD
levelshifter (Snowball uses it for I2C4).
The reason UART1 was anyway enabled on these platforms was
probably to secure the port enumeration to userspace. This
can be solved by using aliases (done in a separate patch) so
we can now deactivate UART1 and let MMC/SD use it properly
on HREFv60plus. We explicitly activate it only for the
older HREFprev60 board.
To complete, we set up the pin configuration for these pins
properly in the sdi0 node.
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/ste-href.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/ste-href.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi index 744c1e3a744d..6d8ce154347e 100644 --- a/arch/arm/boot/dts/ste-href.dtsi +++ b/arch/arm/boot/dts/ste-href.dtsi @@ -32,11 +32,11 @@ status = "okay"; }; + /* This UART is unused and thus left disabled */ uart@80121000 { pinctrl-names = "default", "sleep"; pinctrl-0 = <&uart1_default_mode>; pinctrl-1 = <&uart1_sleep_mode>; - status = "okay"; }; uart@80007000 { |
