Unverified Commit b75cb68d authored by Tuomas Tynkkynen's avatar Tuomas Tynkkynen Committed by Maxime Ripard
Browse files

arm64: 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: default avatarTuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 1c92c009

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+1 −2
Original line number Diff line number Diff line
@@ -120,8 +120,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	disable-wp;

	bus-width = <4>;

	status = "okay";

arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts

+1 −2
Original line number Diff line number Diff line
@@ -82,8 +82,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	disable-wp;

	bus-width = <4>;

	status = "okay";

arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts

+1 −2
Original line number Diff line number Diff line
@@ -68,8 +68,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	disable-wp;

	bus-width = <4>;

	status = "okay";

arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

+1 −2
Original line number Diff line number Diff line
@@ -67,8 +67,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins>;

	vmmc-supply = <&reg_dcdc1>;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;

	cd-inverted;

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;

	disable-wp;

	bus-width = <4>;

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE