1 files changed, 4 insertions, 23 deletions

diff --git a/arch/arm/dts/sun7i-a20-m3.dts b/arch/arm/dts/sun7i-a20-m3.dts
index 8d9ea48dd9..b8a1aaaf39 100644
--- a/arch/arm/dts/sun7i-a20-m3.dts
+++ b/arch/arm/dts/sun7i-a20-m3.dts
@@ -48,7 +48,6 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
         model = "Mele M3";
@@ -64,8 +63,6 @@
 
         leds {
                 compatible = "gpio-leds";
-                pinctrl-names = "default";
-                pinctrl-0 = <&led_pins_m3>;
 
                 blue {
                         label = "m3:blue:usr";
@@ -84,7 +81,7 @@
 
 &gmac {
         pinctrl-names = "default";
-        pinctrl-0 = <&gmac_pins_mii_a>;
+        pinctrl-0 = <&gmac_mii_pins>;
         phy = <&phy1>;
         phy-mode = "mii";
         status = "okay";
@@ -95,8 +92,6 @@
 };
 
 &i2c0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&i2c0_pins_a>;
         status = "okay";
 
         axp209: pmic@34 {
@@ -112,23 +107,18 @@
 
 &ir0 {
         pinctrl-names = "default";
-        pinctrl-0 = <&ir0_rx_pins_a>;
+        pinctrl-0 = <&ir0_rx_pin>;
         status = "okay";
 };
 
 &mmc0 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
-        cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
-        cd-inverted;
+        cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
         status = "okay";
 };
 
 &mmc2 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&mmc2_pins_a>;
         vmmc-supply = <&reg_vcc3v3>;
         bus-width = <4>;
         non-removable;
@@ -143,15 +133,6 @@
         status = "okay";
 };
 
-&pio {
-        led_pins_m3: led_pins@0 {
-                allwinner,pins = "PH20";
-                allwinner,function = "gpio_out";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-        };
-};
-
 &reg_usb1_vbus {
         status = "okay";
 };
@@ -162,7 +143,7 @@
 
 &uart0 {
         pinctrl-names = "default";
-        pinctrl-0 = <&uart0_pins_a>;
+        pinctrl-0 = <&uart0_pb_pins>;
         status = "okay";
 };