ARM: dts: sun8i: a23/a33: 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/sun8i-a23-evb.dts b/arch/arm/boot/dts/sun8i-a23-evb.dts
index b6aeb23b6ee9989f3387665503a13b6145f2b82e..3c994df0ffdf31697ff723ec664d5fa3dfaaaa5b 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-evb.dts
+++ b/arch/arm/boot/dts/sun8i-a23-evb.dts
@@ -104,21 +104,13 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_evb>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_vcc3v0>;
        bus-width = <4>;
        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
        status = "okay";
 };
 
-&pio {
-       mmc0_cd_pin_evb: mmc0_cd_pin@0 {
-               pins = "PB4";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-};
-
 /*
  * The RX line has a non-populated resistance. In order to use it, you
  * need to solder R207 on the back of the board in order to close the

diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 9d545f8549be8a8ac7169361b0cec52c176e70a6..775ab6422eeb449ab354cc47027a1f50190ec9fa 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -141,7 +141,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -167,14 +167,6 @@
        status = "okay";
 };
 
-&pio {
-       mmc0_cd_pin_sina33: mmc0_cd_pin@0 {
-               pins = "PB4";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-};
-
 &r_rsb {
        status = "okay";
 

diff --git a/arch/arm/boot/dts/sun8i-r16-parrot.dts b/arch/arm/boot/dts/sun8i-r16-parrot.dts
index 17868b1eff4e9a0739f503988881b7cac735dc9c..ec987f42204110f560fe4ec8a288f72a0dea48a7 100644 (file)
--- a/arch/arm/boot/dts/sun8i-r16-parrot.dts
+++ b/arch/arm/boot/dts/sun8i-r16-parrot.dts
@@ -127,7 +127,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_parrot>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
        bus-width = <4>;
@@ -163,12 +163,6 @@
 };
 
 &pio {
-       mmc0_cd_pin_parrot: mmc0_cd_pin@0 {
-               pins = "PD14";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        usb0_id_det: usb0_id_detect_pin@0 {
                pins = "PD10";
                function = "gpio_in";

diff --git a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
index c5f0f2e627bf3b4c9fa1a64f1ae2cdcbed6af82e..6838bce7dd4e16f83b0c8b3539d577ea266c3df8 100644 (file)
--- a/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
+++ b/arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
@@ -81,7 +81,7 @@
 
 &mmc0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+       pinctrl-0 = <&mmc0_pins_a>;
        vmmc-supply = <&reg_dcdc1>;
        bus-width = <4>;
        cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@@ -89,12 +89,6 @@
 };
 
 &pio {
-       mmc0_cd_pin: mmc0_cd_pin@0 {
-               pins = "PB4";
-               function = "gpio_in";
-               bias-pull-up;
-       };
-
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
                pins = "PH8";
                function = "gpio_in";