Commit 8620f384098b ("dm: sunxi: Linksprite_pcDuino3: Correct polarity of MMC card detect") claims that the Pcduino3 device tree had an incorrect polarity for the card detect pin and thus changed the polarity flag of the cd-gpios from GPIO_ACTIVE_HIGH to GPIO_ACTIVE_LOW.

Actually the DT was correct since according to the mmc binding, a combination of GPIO_ACTIVE_HIGH + cd-inverted results in an active-low polarity. But because the U-Boot driver lacks the code to look at the cd-inverted property (unlike the Linux driver) it interpreted the polarity of active-high. Thus, after that commit the DT is actually wrong from the binding/Linux point of view.

To make both Linux and U-Boot interpret the DT in the same way, just drop the left-over cd-inverted property. I've sent a Linux patch to switch all sunxi DTs over to not using the cd-inverted property, so eventually all sunxi boards in U-Boot will be consistent in not using cd-inverted.

Signed-off-by: Tuomas Tynkkynen tuomas@tuxera.com --- This patch supersedes the following two patches: - [PATCH 1/2] mmc: sunxi: Support cd-inverted DT property - [PATCH 2/2] ARM: sunxi: Enable DM MMC+SATA for the PcDuino3 Nano board

arch/arm/dts/sun7i-a20-pcduino3.dts | 1 - 1 file changed, 1 deletion(-)

diff --git a/arch/arm/dts/sun7i-a20-pcduino3.dts b/arch/arm/dts/sun7i-a20-pcduino3.dts index 37b1e0ee9b..7f449b6a28 100644 --- a/arch/arm/dts/sun7i-a20-pcduino3.dts +++ b/arch/arm/dts/sun7i-a20-pcduino3.dts @@ -165,7 +165,6 @@ vmmc-supply = <&reg_vcc3v3>; bus-width = <4>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ - cd-inverted; status = "okay"; };