Commit 79badc74 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: dts: sun5i: 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 f606c4b3
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@

&mmc0 {
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t003>;
	pinctrl-0 = <&mmc0_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -106,12 +106,6 @@
};

&pio {
	mmc0_cd_pin_t003: mmc0_cd_pin@0 {
		pins = "PG1";
		function = "gpio_in";
		bias-pull-up;
	};

	led_pins_t003: led_pins@0 {
		pins = "PB2";
		function = "gpio_out";
+1 −7
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@

&mmc0 {
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
	pinctrl-0 = <&mmc0_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -131,12 +131,6 @@
		bias-pull-up;
	};

	mmc0_cd_pin_t004: mmc0_cd_pin@0 {
		pins = "PG1";
		function = "gpio_in";
		bias-pull-up;
	};

	led_pins_t004: led_pins@0 {
		pins = "PB2";
		function = "gpio_out";
+1 −9
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@

&mmc0 {
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_mk802>;
	pinctrl-0 = <&mmc0_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -111,14 +111,6 @@
	status = "okay";
};

&pio {
	mmc0_cd_pin_mk802: mmc0_cd_pin@0 {
		pins = "PG1";
		function = "gpio_in";
		bias-pull-up;
	};
};

&reg_usb1_vbus {
	gpio = <&pio 1 10 GPIO_ACTIVE_HIGH>; /* PB10 */
	status = "okay";
+2 −14
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@

&mmc0 {
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
	pinctrl-0 = <&mmc0_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -207,7 +207,7 @@

&mmc1 {
	pinctrl-names = "default";
	pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
	pinctrl-0 = <&mmc1_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
@@ -223,18 +223,6 @@
};

&pio {
	mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
		pins = "PG1";
		function = "gpio_in";
		bias-pull-up;
	};

	mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
		pins = "PG13";
		function = "gpio_in";
		bias-pull-up;
	};

	led_pins_olinuxino: led_pins@0 {
		pins = "PE3";
		function = "gpio_out";
+1 −7
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@

&mmc0 {
	pinctrl-names = "default";
	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_r7>;
	pinctrl-0 = <&mmc0_pins_a>;
	vmmc-supply = <&reg_vcc3v3>;
	bus-width = <4>;
	cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
@@ -98,12 +98,6 @@
};

&pio {
	mmc0_cd_pin_r7: mmc0_cd_pin@0 {
		pins = "PG1";
		function = "gpio_in";
		bias-pull-up;
	};

	led_pins_r7: led_pins@0 {
		pins = "PB2";
		function = "gpio_out";
Loading