1 files changed, 8 insertions, 15 deletions

diff --git a/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts b/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
index 5faeae429e..bb14b171b1 100644
--- a/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
+++ b/arch/arm/dts/sun6i-a31-mele-a1000g-quad.dts
@@ -45,7 +45,6 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
         model = "Mele A1000G Quad top set box";
@@ -108,8 +107,7 @@
         pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_m9>;
         vmmc-supply = <&reg_dcdc1>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 22 GPIO_ACTIVE_HIGH>; /* PH22 */
-        cd-inverted;
+        cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
         status = "okay";
 };
 
@@ -128,24 +126,19 @@
 
 &pio {
         led_pins_m9: led_pins@0 {
-                allwinner,pins = "PH13";
-                allwinner,function = "gpio_out";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+                pins = "PH13";
+                function = "gpio_out";
         };
 
         mmc0_cd_pin_m9: mmc0_cd_pin@0 {
-                allwinner,pins = "PH22";
-                allwinner,function = "gpio_in";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+                pins = "PH22";
+                function = "gpio_in";
+                bias-pull-up;
         };
 
         usb1_vbus_pin_m9: usb1_vbus_pin@0 {
-                allwinner,pins = "PC27";
-                allwinner,function = "gpio_out";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+                pins = "PC27";
+                function = "gpio_out";
         };
 };