Commit 1d8aca9d authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson

ARM: ux500: fix MMC/SD card regression

Ux500 is regressing due to commit
a21763a0
"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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 109978de
...@@ -32,11 +32,11 @@ uart@80120000 { ...@@ -32,11 +32,11 @@ uart@80120000 {
status = "okay"; status = "okay";
}; };
/* This UART is unused and thus left disabled */
uart@80121000 { uart@80121000 {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart1_default_mode>; pinctrl-0 = <&uart1_default_mode>;
pinctrl-1 = <&uart1_sleep_mode>; pinctrl-1 = <&uart1_sleep_mode>;
status = "okay";
}; };
uart@80007000 { uart@80007000 {
......
...@@ -23,6 +23,11 @@ button@1 { ...@@ -23,6 +23,11 @@ button@1 {
}; };
soc { soc {
/* Enable UART1 on this board */
uart@80121000 {
status = "okay";
};
i2c@80004000 { i2c@80004000 {
tps61052@33 { tps61052@33 {
compatible = "tps61052"; compatible = "tps61052";
......
...@@ -43,15 +43,26 @@ pinctrl { ...@@ -43,15 +43,26 @@ pinctrl {
<&vaudio_hf_hrefv60_mode>, <&vaudio_hf_hrefv60_mode>,
<&gbf_hrefv60_mode>, <&gbf_hrefv60_mode>,
<&hdtv_hrefv60_mode>, <&hdtv_hrefv60_mode>,
<&touch_hrefv60_mode>; <&touch_hrefv60_mode>,
<&gpios_hrefv60_mode>;
sdi0 { sdi0 {
/* SD card detect GPIO pin, extend default state */
sdi0_default_mode: sdi0_default { sdi0_default_mode: sdi0_default {
/* SD card detect GPIO pin, extend default state */
default_hrefv60_cfg1 { default_hrefv60_cfg1 {
pins = "GPIO95_E8"; pins = "GPIO95_E8";
ste,config = <&gpio_in_pu>; ste,config = <&gpio_in_pu>;
}; };
/* VMMCI level-shifter enable */
default_hrefv60_cfg2 {
pins = "GPIO169_D22";
ste,config = <&gpio_out_lo>;
};
/* VMMCI level-shifter voltage select */
default_hrefv60_cfg3 {
pins = "GPIO5_AG6";
ste,config = <&gpio_out_hi>;
};
}; };
}; };
ipgpio { ipgpio {
...@@ -213,6 +224,16 @@ hrefv60_cfg2 { ...@@ -213,6 +224,16 @@ hrefv60_cfg2 {
}; };
}; };
}; };
gpios {
/* Dangling GPIO pins */
gpios_hrefv60_mode: gpios_hrefv60 {
default_cfg1 {
/* Normally UART1 RXD, now dangling */
pins = "GPIO4_AH6";
ste,config = <&in_pu>;
};
};
};
}; };
}; };
}; };
...@@ -230,11 +230,11 @@ uart@80120000 { ...@@ -230,11 +230,11 @@ uart@80120000 {
status = "okay"; status = "okay";
}; };
/* This UART is unused and thus left disabled */
uart@80121000 { uart@80121000 {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&uart1_default_mode>; pinctrl-0 = <&uart1_default_mode>;
pinctrl-1 = <&uart1_sleep_mode>; pinctrl-1 = <&uart1_sleep_mode>;
status = "okay";
}; };
uart@80007000 { uart@80007000 {
...@@ -459,7 +459,21 @@ snowball_cfg1 { ...@@ -459,7 +459,21 @@ snowball_cfg1 {
pins = "GPIO21_AB3"; /* DAT31DIR */ pins = "GPIO21_AB3"; /* DAT31DIR */
ste,config = <&out_hi>; ste,config = <&out_hi>;
}; };
/* SD card detect GPIO pin, extend default state */
snowball_cfg2 {
pins = "GPIO218_AH11";
ste,config = <&gpio_in_pu>;
};
/* VMMCI level-shifter enable */
snowball_cfg3 {
pins = "GPIO217_AH12";
ste,config = <&gpio_out_lo>;
};
/* VMMCI level-shifter voltage select */
snowball_cfg4 {
pins = "GPIO228_AJ6";
ste,config = <&gpio_out_hi>;
};
}; };
}; };
ssp0 { ssp0 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment