1 files changed, 10 insertions, 19 deletions

diff --git a/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
index 6efbba6d40..378214d831 100644
--- a/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
+++ b/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
@@ -46,7 +46,6 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 #include <dt-bindings/pwm/pwm.h>
 
 / {
@@ -126,8 +125,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_d709>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */
-        cd-inverted;
+        cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
         status = "okay";
 };
 
@@ -137,24 +135,21 @@
 
 &pio {
         mmc0_cd_pin_d709: mmc0_cd_pin@0 {
-                allwinner,pins = "PG0";
-                allwinner,function = "gpio_in";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                pins = "PG0";
+                function = "gpio_in";
+                bias-pull-up;
         };
 
         usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
-                allwinner,pins = "PG1";
-                allwinner,function = "gpio_in";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
+                pins = "PG1";
+                function = "gpio_in";
+                bias-pull-down;
         };
 
         usb0_id_detect_pin: usb0_id_detect_pin@0 {
-                allwinner,pins = "PG2";
-                allwinner,function = "gpio_in";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                pins = "PG2";
+                function = "gpio_in";
+                bias-pull-up;
         };
 };
 
@@ -211,10 +206,6 @@
         status = "okay";
 };
 
-&usb0_vbus_pin_a {
-        allwinner,pins = "PG12";
-};
-
 &usbphy {
         pinctrl-names = "default";
         pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;