1 files changed, 27 insertions, 32 deletions

diff --git a/arch/arm/dts/sun4i-a10-mk802.dts b/arch/arm/dts/sun4i-a10-mk802.dts
index ee46ea8548..059fe9c5d0 100644
--- a/arch/arm/dts/sun4i-a10-mk802.dts
+++ b/arch/arm/dts/sun4i-a10-mk802.dts
@@ -44,7 +44,6 @@
 #include "sun4i-a10.dtsi"
 #include "sunxi-common-regulators.dtsi"
 #include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
         model = "MK802";
@@ -57,12 +56,27 @@
         chosen {
                 stdout-path = "serial0:115200n8";
         };
+
+        hdmi-connector {
+                compatible = "hdmi-connector";
+                type = "a";
+
+                port {
+                        hdmi_con_in: endpoint {
+                                remote-endpoint = <&hdmi_out_con>;
+                        };
+                };
+        };
 };
 
 &codec {
         status = "okay";
 };
 
+&de {
+        status = "okay";
+};
+
 &ehci0 {
         status = "okay";
 };
@@ -71,13 +85,20 @@
         status = "okay";
 };
 
+&hdmi {
+        status = "okay";
+};
+
+&hdmi_out {
+        hdmi_out_con: endpoint {
+                remote-endpoint = <&hdmi_con_in>;
+        };
+};
+
 &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";
 };
 
@@ -89,29 +110,6 @@
         status = "okay";
 };
 
-&pio {
-        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-                allwinner,pins = "PH4";
-                allwinner,function = "gpio_in";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-        };
-
-        usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
-                allwinner,pins = "PH5";
-                allwinner,function = "gpio_in";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-        };
-
-        usb2_vbus_pin_mk802: usb2_vbus_pin@0 {
-                allwinner,pins = "PH12";
-                allwinner,function = "gpio_out";
-                allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-                allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-        };
-};
-
 &reg_usb0_vbus {
         status = "okay";
 };
@@ -121,14 +119,13 @@
 };
 
 &reg_usb2_vbus {
-        pinctrl-0 = <&usb2_vbus_pin_mk802>;
         gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */
         status = "okay";
 };
 
 &uart0 {
         pinctrl-names = "default";
-        pinctrl-0 = <&uart0_pins_a>;
+        pinctrl-0 = <&uart0_pb_pins>;
         status = "okay";
 };
 
@@ -138,8 +135,6 @@
 };
 
 &usbphy {
-        pinctrl-names = "default";
-        pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
         usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
         usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
         usb0_vbus-supply = <&reg_usb0_vbus>;