Commit 6d84b6c9 authored by Andre Przywara's avatar Andre Przywara Committed by Maxime Ripard
Browse files

arm64: dts: allwinner: H5: remove redundant MMC0 card detect pin 



PF6 is mostly used as the CD pin for the microSD slot on H5 based
boards. So far we were referencing this pin twice: once using the
mmc0_cd_pin phandle, and then again directly as a GPIO via the pinctrl
phandle.
This will cause problems if the pinctrl driver enables strict mode, as
the second request will fail now, leading to a driver init failure.
Remove the redundant pin reference via the mmc0_cd_pin phandle.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reported-by: default avatarChris Obbard <obbardc@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent e5701010

arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ 


&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ 


&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 


&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 


&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 


&mmc0 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE