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

Unverified Commit 8860687a authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sun7i: Remove card detect pull-up 



Boards usually have an external pull-up on the card-detect signal, so
there's no need to add another one.

This also removes a DTC warning.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent 054da074

arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts

+1 −9
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ 


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -220,14 +220,6 @@ 
	status = "okay";

};



&pio {

	mmc0_cd_pin_bpi_m1p: mmc0_cd_pin@0 {

		pins = "PH10";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_dcdc2 {

	regulator-always-on;

	regulator-min-microvolt = <1000000>;

arch/arm/boot/dts/sun7i-a20-bananapi.dts

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


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -253,12 +253,6 @@ 
		function = "gpio_in";

		bias-pull-up;

	};



	mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {

		pins = "PH10";

		function = "gpio_in";

		bias-pull-up;

	};

};



#include "axp209.dtsi"

arch/arm/boot/dts/sun7i-a20-bananapro.dts

+1 −9
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -182,14 +182,6 @@ 
	status = "okay";

};



&pio {

	mmc0_cd_pin_bananapro: mmc0_cd_pin@0 {

		pins = "PH10";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_usb1_vbus {

	gpio = <&pio 7 0 GPIO_ACTIVE_HIGH>; /* PH0 */

	status = "okay";

arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts

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


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
@@ -241,12 +241,6 @@ 
		function = "gpio_in";

		bias-pull-up;

	};



	mmc0_cd_pin_lamobo_r1: mmc0_cd_pin@0 {

		pins = "PH10";

		function = "gpio_in";

		bias-pull-up;

	};

};



#include "axp209.dtsi"

arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts

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


&mmc3 {

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins_a>, <&mmc3_cd_pin_olimex_som_evb>;

	pinctrl-0 = <&mmc3_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
@@ -244,12 +244,6 @@ 
		function = "gpio_out";

		drive-strength = <20>;

	};



	mmc3_cd_pin_olimex_som_evb: mmc3_cd_pin@0 {

		pins = "PH0";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_ahci_5v {