Merge branch 'omap-for-v4.21/dt' into omap-for-v5.1/dt

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun8i-a23-polaroid-mid2407pxe03.dts

diff --git a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
index 649e31339662832c4fa64bbfe18cd07bc1aef61b..d5f6aebd7216d2cc910d44919355bd622d98d480 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
+++ b/arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
@@ -54,8 +54,6 @@
 
        wifi_pwrseq: wifi_pwrseq {
                compatible = "mmc-pwrseq-simple";
-               pinctrl-names = "default";
-               pinctrl-0 = <&wifi_pwrseq_pin_mid2407>;
                reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
                /* The esp8089 needs 200 ms after driving wifi-en high */
                post-power-on-delay-ms = <200>;
@@ -71,7 +69,7 @@
 
 &mmc1 {
        pinctrl-names = "default";
-       pinctrl-0 = <&mmc1_pins_a>;
+       pinctrl-0 = <&mmc1_pg_pins>;
        vmmc-supply = <&reg_dldo1>;
        mmc-pwrseq = <&wifi_pwrseq>;
        bus-width = <4>;
@@ -85,17 +83,6 @@
        };
 };
 
-&mmc1_pins_a {
-       bias-pull-up;
-};
-
-&r_pio {
-       wifi_pwrseq_pin_mid2407: wifi_pwrseq_pin@0 {
-               pins = "PL6";
-               function = "gpio_out";
-       };
-};
-
 &touchscreen {
        reg = <0x40>;
        compatible = "silead,gsl1680";