From: Andrew Goodbody <redacted>
The SD card lines use external pullups and so the internal pullups need
to be disabled so that they do not cause contention on the lines.
This bug was revealed by correcting the effective bit mask of
the pinctrl device. Use the correct macro for DM8168.
Also fix typo in comment SD_DAT2->SD_DAT3.
Fixes: 86800ffe84055 ("ARM: dts: omap: dm816x: Correct pinctrl register")
Signed-off-by: Andrew Goodbody <redacted>
Reviewed-by: Christopher Obbard <redacted>
Tested-by: Christopher Obbard <redacted>
[ettore.chimenti@linaro.org: squashed after fixing DM816x macros ]
Reviewed-by: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Ettore Chimenti <redacted>
---
arch/arm/boot/dts/ti/omap/dm8168-evm.dts | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/ti/omap/dm8168-evm.dts b/arch/arm/boot/dts/ti/omap/dm8168-evm.dts
index 81450e15b889..a6d42766a496 100644
--- a/arch/arm/boot/dts/ti/omap/dm8168-evm.dts
+++ b/arch/arm/boot/dts/ti/omap/dm8168-evm.dts
@@ -45,13 +45,13 @@ DM816X_IOPAD(0x0aac, MUX_MODE0) /* SPI_D1 */
mmc_pins: mmc-pins {
pinctrl-single,pins = <
- DM816X_IOPAD(0x0a70, MUX_MODE0) /* SD_POW */
- DM816X_IOPAD(0x0a74, MUX_MODE0) /* SD_CLK */
- DM816X_IOPAD(0x0a78, MUX_MODE0) /* SD_CMD */
- DM816X_IOPAD(0x0a7C, MUX_MODE0) /* SD_DAT0 */
- DM816X_IOPAD(0x0a80, MUX_MODE0) /* SD_DAT1 */
- DM816X_IOPAD(0x0a84, MUX_MODE0) /* SD_DAT2 */
- DM816X_IOPAD(0x0a88, MUX_MODE0) /* SD_DAT2 */
+ DM816X_IOPAD(0x0a70, PULL_DIS | MUX_MODE0) /* SD_POW */
+ DM816X_IOPAD(0x0a74, PULL_DIS | MUX_MODE0) /* SD_CLK */
+ DM816X_IOPAD(0x0a78, PULL_DIS | MUX_MODE0) /* SD_CMD */
+ DM816X_IOPAD(0x0a7C, PULL_DIS | MUX_MODE0) /* SD_DAT0 */
+ DM816X_IOPAD(0x0a80, PULL_DIS | MUX_MODE0) /* SD_DAT1 */
+ DM816X_IOPAD(0x0a84, PULL_DIS | MUX_MODE0) /* SD_DAT2 */
+ DM816X_IOPAD(0x0a88, PULL_DIS | MUX_MODE0) /* SD_DAT3 */
DM816X_IOPAD(0x0a8c, MUX_MODE2) /* GP1[7] */
DM816X_IOPAD(0x0a90, MUX_MODE2) /* GP1[8] */
>;
--
2.56.0