Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f8d5fe8f authored by Joonas Kylmälä's avatar Joonas Kylmälä Committed by Maxime Ripard
Browse files

ARM: dts: sunxi: h3-h5: remove mmc0 card detection pin from pinctrl 



The GPIO card detection pin (mmc0_cd_pin) is already requested and
configured by mmc_gpiod_request_cd() in drivers/mmc/core/slot-gpio.c
so pinctrl is not needed.

Signed-off-by: default avatarJoonas Kylmälä <joonas.kylmala@iki.fi>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 8b8061fc

arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,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/arm/boot/dts/sun8i-h3-beelink-x2.dts

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,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/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,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/arm/boot/dts/sun8i-h3-nanopi.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
	bus-width = <4>;

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

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	status = "okay";

	vmmc-supply = <&reg_vcc3v3>;

};

arch/arm/boot/dts/sun8i-h3-orangepi-2.dts

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,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 */