Merge tag 'mips-pull-2019-11-16' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / arch / arm / dts / sun4i-a10-mk802.dts

diff --git a/arch/arm/dts/sun4i-a10-mk802.dts b/arch/arm/dts/sun4i-a10-mk802.dts
index 3c7eebe170882d67623ed7ca1aa005bb662dddb3..059fe9c5d0243eb85165c500ea37c093b74a1d76 100644 (file)
--- a/arch/arm/dts/sun4i-a10-mk802.dts
+++ b/arch/arm/dts/sun4i-a10-mk802.dts
@@ -56,6 +56,25 @@
        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 {
@@ -66,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";
 };
 
@@ -80,13 +106,12 @@
        status = "okay";
 };
 
-&pio {
-       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>;
-       };
+&otg_sram {
+       status = "okay";
+};
+
+&reg_usb0_vbus {
+       status = "okay";
 };
 
 &reg_usb1_vbus {
@@ -94,18 +119,25 @@
 };
 
 &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";
+};
+
+&usb_otg {
+       dr_mode = "otg";
        status = "okay";
 };
 
 &usbphy {
+       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>;
        usb1_vbus-supply = <&reg_usb1_vbus>;
        usb2_vbus-supply = <&reg_usb2_vbus>;
        status = "okay";