Unverified Commit d491714e authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sun6i: 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 8f9e1052

arch/arm/boot/dts/sun6i-a31-colombus.dts

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


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v0>;

	bus-width = <4>;

	cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -126,12 +126,6 @@ 
};



&pio {

	mmc0_cd_pin_colombus: mmc0_cd_pin@0 {

		pins = "PA8";

		function = "gpio_in";

		bias-pull-up;

	};



	i2c_lcd_pins: i2c_lcd_pin@0 {

		pins = "PA23", "PA24";

		function = "gpio_out";

arch/arm/boot/dts/sun6i-a31-hummingbird.dts

+1 −10
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ 


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -241,15 +241,6 @@ 
	status = "okay";

};



&pio {

	mmc0_cd_pin_hummingbird: mmc0_cd_pin@0 {

		pins = "PA8";

		function = "gpio_in";

		bias-pull-up;

	};



};



&p2wi {

	status = "okay";

arch/arm/boot/dts/sun6i-a31-i7.dts

+1 −9
Original line number Diff line number Diff line
@@ -144,21 +144,13 @@ 


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_vcc3v3>;

	bus-width = <4>;

	cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */

	status = "okay";

};



&pio {

	mmc0_cd_pin_i7: mmc0_cd_pin@0 {

		pins = "PH22";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_usb1_vbus {

	gpio = <&pio 2 27 GPIO_ACTIVE_HIGH>;

	status = "okay";

arch/arm/boot/dts/sun6i-a31-m9.dts

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


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
@@ -122,14 +122,6 @@ 


#include "axp22x.dtsi"



&pio {

	mmc0_cd_pin_m9: mmc0_cd_pin@0 {

		pins = "PH22";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_aldo1 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts

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


&mmc0 {

	pinctrl-names = "default";

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

	pinctrl-0 = <&mmc0_pins_a>;

	vmmc-supply = <&reg_dcdc1>;

	bus-width = <4>;

	cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
@@ -122,14 +122,6 @@ 


#include "axp22x.dtsi"



&pio {

	mmc0_cd_pin_m9: mmc0_cd_pin@0 {

		pins = "PH22";

		function = "gpio_in";

		bias-pull-up;

	};

};



&reg_aldo1 {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE