Unverified Commit 3dd4ce41 authored by Andre Przywara's avatar Andre Przywara Committed by Maxime Ripard
Browse files

arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems 



Commit 941432d0 ("arm64: dts: allwinner: Drop non-removable from
SoPine/LTS SD card") enabled the card detect GPIO for the SOPine module,
along the way with the Pine64-LTS, which share the same base .dtsi.

However while both boards indeed have a working CD GPIO on PF6, the
polarity is different: the SOPine modules uses a "push-pull" socket,
which has an active-high switch, while the Pine64-LTS use the more
traditional push-push socket and the common active-low switch.

Fix the polarity in the sopine.dtsi, and overwrite it in the LTS
board .dts, to make the SD card work again on systems using SOPine
modules.

Fixes: 941432d0 ("arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card")
Reported-by: default avatarAshley <contact@victorianfox.com>
Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20210316144219.5973-1-andre.przywara@arm.com
parent fbb9e866

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

+4 −0
Original line number Diff line number Diff line
@@ -19,3 +19,7 @@ 
		};

	};

};



&mmc0 {

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */

};

arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
	vmmc-supply = <&reg_dcdc1>;

	disable-wp;

	bus-width = <4>;

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

	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */

	status = "okay";

};