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

diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 557d4a988d9a402f8d4bf9fff4f8180deb412457..21584c2f968f4734337715ae454cfb74c660ced7 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -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";

diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index fc49d14059b168d911c91bbdd8ef84f0c58431fe..5a3b0face30e6d40fc8b40ac56ae9a9204d5d3ab 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -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";
 

diff --git a/arch/arm/boot/dts/sun6i-a31-i7.dts b/arch/arm/boot/dts/sun6i-a31-i7.dts
index 679f0fa7e50c42aa367b98949bf2454d526ff67e..f3e95d08fefcf57e1c0332c113b87ed037886d3e 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-i7.dts
+++ b/arch/arm/boot/dts/sun6i-a31-i7.dts
@@ -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";

diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index 87ae3031aa8968bfcbb449050acd106be7041ec8..90fb1f6038203fe5ddead9e21ec76affb47cbb65 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -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>;

diff --git a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
index 0711f55945e0e81f4eb2d38e102aa773dc52679e..3dcf44580839e6dcbb25dd77ef7301d2bf52d5a4 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -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>;

diff --git a/arch/arm/boot/dts/sun6i-a31s-primo81.dts b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
index dd6ede6a8377e0da96e337888ce0296c45bc360b..55d60c68694ec66b04c6441a57fe66cba1a611ce 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-primo81.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-primo81.dts
@@ -146,7 +146,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_primo81>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -159,12 +159,6 @@
                function = "gpio_in";
                bias-pull-up;
        };
-
-       mmc0_cd_pin_primo81: mmc0_cd_pin@0 {
-               pins = "PA8";
-               function = "gpio_in";
-               bias-pull-up;
-       };
 };
 
 &p2wi {

diff --git a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
index 1b07a950cb457db022859b69d63c4dda2166d892..02c9a90fe876ea33e0aca727c4dc1aeb3d6098d4 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sina31s.dts
@@ -162,7 +162,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina31s>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
        cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
@@ -173,14 +173,6 @@
        status = "okay";
 };
 
-&pio {
-       mmc0_cd_pin_sina31s: mmc0_cd_pin@0 {
-               pins = "PA4";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-};
-
 &reg_dldo1 {
        regulator-min-microvolt = <3300000>;
        regulator-max-microvolt = <3300000>;

diff --git a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
index ea29af15125bcfa644408578454a9c83530841c2..016b23831cec5a289f19e31d2212b6728821ee2d 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
@@ -113,7 +113,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bpi_m2>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
        cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
@@ -163,14 +163,6 @@
        };
 };
 
-&pio {
-       mmc0_cd_pin_bpi_m2: mmc0_cd_pin@0 {
-               pins = "PA4";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-};
-
 #include "axp22x.dtsi"
 
 &reg_aldo1 {

diff --git a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
index aab6c1720ef7973e779edd55ebd7a5a369dbfbde..2d8dc4321b7b9ae58fe6d6274f8fb6b7afddcd86 100644 (file)
--- a/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
+++ b/arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
@@ -89,17 +89,9 @@
        status = "okay";
 };
 
-&pio {
-       mmc0_cd_pin_bs1078v2: mmc0_cd_pin@0 {
-               pins = "PA8";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-};
-
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bs1078v2>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v0>;
        bus-width = <4>;
        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */

diff --git a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
index 4e72e4f3ef96eeed666fa37b12b5d568abc27ffc..77f952b1218898eb4fc880f495440d0b51086adb 100644 (file)
--- a/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
@@ -66,7 +66,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_e708_q1>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
@@ -74,12 +74,6 @@
 };
 
 &pio {
-       mmc0_cd_pin_e708_q1: mmc0_cd_pin@0 {
-               pins = "PA8";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PA15";
                function = "gpio_in";