summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/sun6i-a31-m9.dts
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2017-12-22 21:57:37 +0100
committerMaxime Ripard <maxime.ripard@bootlin.com>2018-02-13 09:37:22 +0100
commit45e01f401a2a16a8d7ca910fe01c124451980bd8 (patch)
treef18e6a5308ef03cce298d440115fb8d893463618 /arch/arm/boot/dts/sun6i-a31-m9.dts
parentARM: dts: nanopi-neo-air: Add WiFi / eMMC (diff)
downloadlinux-45e01f401a2a16a8d7ca910fe01c124451980bd8.tar.xz
linux-45e01f401a2a16a8d7ca910fe01c124451980bd8.zip
ARM: dts: sunxi: Switch MMC nodes away from cd-inverted property
Using the cd-inverted property is not useful when GPIOs are used as card detects since the polarity can be specified with the usual GPIO_ACTIVE_(HIGH|LOW) GPIO flags. It has also caused confusion for U-Boot developers, so migrate all sunxi boards away from cd-inverted. Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Diffstat (limited to 'arch/arm/boot/dts/sun6i-a31-m9.dts')
-rw-r--r--arch/arm/boot/dts/sun6i-a31-m9.dts3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 50605fd4449e..9698f6d38d03 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -107,8 +107,7 @@
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
- cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
- cd-inverted;
+ cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
status = "okay";
};