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

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun6i-a31s-yones-toptech-bs1078-v2.dts

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..2504e7189c5474361428b64b2729415bbb889f4f 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
@@ -62,14 +62,10 @@
 };
 
 &i2c1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c1_pins_a>;
        status = "okay";
 };
 
 &i2c2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&i2c2_pins_a>;
        status = "okay";
 };
 
@@ -89,27 +85,13 @@
        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>;
        vmmc-supply = <&reg_vcc3v0>;
        bus-width = <4>;
        cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
        status = "okay";
 };
 
-&mmc0_pins_a {
-       bias-pull-up;
-};
-
 &p2wi {
        status = "okay";
 
@@ -189,7 +171,7 @@
 
 &uart0 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart0_pins_a>;
+       pinctrl-0 = <&uart0_ph_pins>;
        status = "okay";
 };