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: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
index 39504d720efc9c71dae786f1dcb3f862f8ba469f..9e076e748b78d27cd12410705d3d645e97c125c7 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
@@ -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";

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index f103e174cd981d17eb2dab711b10280e9cf9baf1..4dd98cbd1ddb8519ea01c04815af4a193c4d804d 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -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";

diff --git a/arch/arm/boot/dts/sun5i-a10s-mk802.dts b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
index b17c036293d6ce3730eee800ca2f4a3d963f2b88..822f1b2ac6d3d9defb969bc29e4f1f0bffc100e6 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-mk802.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-mk802.dts
@@ -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";

diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 3ffae227bab32078649ade789e06d8aefffc47d7..15889639a8416d6cace5185d35883de071dd088f 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -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";

diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index 1e713a42e34f86d4917009e79d02aa0a32baacc2..ba2d2e604d549c1f5512360f7af59e7ec5033fa4 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -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";

diff --git a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
index d8bff29f1049d20bb7691c58d7b3c323b368d624..69581f8c4e8f7a055f09ecbf4e237afd283e517a 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
@@ -123,7 +123,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_wobo_i5>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
        cd-gpios = <&pio 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
@@ -138,14 +138,6 @@
        status = "okay";
 };
 
-&pio {
-       mmc0_cd_pin_wobo_i5: mmc0_cd_pin@0 {
-               pins = "PB3";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-};
-
 &reg_dcdc2 {
        regulator-always-on;
        regulator-min-microvolt = <1000000>;

diff --git a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
index 30a86cadf5a5421e9a5fd93169ba1c845647427c..4b892f609240c85dce8a1d349066cf843a7cb83b 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
@@ -122,7 +122,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -134,12 +134,6 @@
 };
 
 &pio {
-       mmc0_cd_pin_d709: mmc0_cd_pin@0 {
-               pins = "PG0";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
                pins = "PG1";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
index f6211c22e4dca686afc565c61de40686bf9c670f..ff845f48c832d0d279b3ff3d98c694ff985f4066 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
+++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
@@ -117,7 +117,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_h702>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -133,12 +133,6 @@
 };
 
 &pio {
-       mmc0_cd_pin_h702: mmc0_cd_pin@0 {
-               pins = "PG0";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PG2";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index 0e107ff5cff06525c0e24e3f843cfddb072481c4..8d104a0395ddfb5e00c87007241cb1032d4c8a45 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -96,7 +96,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -112,12 +112,6 @@
 };
 
 &pio {
-       mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 {
-               pins = "PG0";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        led_pins_olinuxinom: led_pins@0 {
                pins = "PG9";
                function = "gpio_out";

diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index d963cac2a04d51934f2d70580548fd42d3514cbd..1703b5379f6b9a883366cb28ba1ffbeeaf9039ea 100644 (file)
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -191,7 +191,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -207,12 +207,6 @@
 };
 
 &pio {
-       mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 {
-               pins = "PG0";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        led_pins_olinuxino: led_pins@0 {
                pins = "PG9";
                function = "gpio_out";

diff --git a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
index eafb362e39931c496a90c1a10fc776da50e42cf3..12c80be6369374a324827ea7dc2f832180ce270e 100644 (file)
--- a/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
@@ -121,7 +121,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v0>;
        bus-width = <4>;
        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
@@ -133,12 +133,6 @@
 };
 
 &pio {
-       mmc0_cd_pin: mmc0_cd_pin@0 {
-               pins = "PG0";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
                pins = "PG1";
                function = "gpio_in";