Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / sun5i-a10s-olinuxino-micro.dts

diff --git a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
index aef91476f9aec0dcc880079a3c8f9112fa3f134c..2c902ed2c87af65cadaddf0cc848a09f1936d3a5 100644 (file)
--- a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
@@ -48,7 +48,6 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
-#include <dt-bindings/pinctrl/sun4i-a10.h>
 
 / {
        model = "Olimex A10s-Olinuxino Micro";
@@ -64,6 +63,17 @@
                stdout-path = "serial0:115200n8";
        };
 
+       connector {
+               compatible = "hdmi-connector";
+               type = "a";
+
+               port {
+                       hdmi_con_in: endpoint {
+                               remote-endpoint = <&hdmi_out_con>;
+                       };
+               };
+       };
+
        leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
@@ -77,13 +87,17 @@
        };
 };
 
+&be0 {
+       status = "okay";
+};
+
 &ehci0 {
        status = "okay";
 };
 
 &emac {
        pinctrl-names = "default";
-       pinctrl-0 = <&emac_pins_a>;
+       pinctrl-0 = <&emac_pins_b>;
        phy = <&phy1>;
        status = "okay";
 };
@@ -92,6 +106,16 @@
        status = "okay";
 };
 
+&hdmi {
+       status = "okay";
+};
+
+&hdmi_out {
+       hdmi_out_con: endpoint {
+               remote-endpoint = <&hdmi_con_in>;
+       };
+};
+
 &i2c0 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c0_pins_a>;
@@ -177,8 +201,7 @@
        pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino_micro>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
-       cd-gpios = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */
-       cd-inverted;
+       cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
        status = "okay";
 };
 
@@ -187,8 +210,7 @@
        pinctrl-0 = <&mmc1_pins_a>, <&mmc1_cd_pin_olinuxino_micro>;
        vmmc-supply = <&reg_vcc3v3>;
        bus-width = <4>;
-       cd-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */
-       cd-inverted;
+       cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
        status = "okay";
 };
 
@@ -202,38 +224,32 @@
 
 &pio {
        mmc0_cd_pin_olinuxino_micro: mmc0_cd_pin@0 {
-               allwinner,pins = "PG1";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG1";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        mmc1_cd_pin_olinuxino_micro: mmc1_cd_pin@0 {
-               allwinner,pins = "PG13";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG13";
+               function = "gpio_in";
+               bias-pull-up;
        };
 
        led_pins_olinuxino: led_pins@0 {
-               allwinner,pins = "PE3";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_20_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PE3";
+               function = "gpio_out";
+               drive-strength = <20>;
        };
 
        usb1_vbus_pin_olinuxino_m: usb1_vbus_pin@0 {
-               allwinner,pins = "PB10";
-               allwinner,function = "gpio_out";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+               pins = "PB10";
+               function = "gpio_out";
        };
 
        usb0_id_detect_pin: usb0_id_detect_pin@0 {
-               allwinner,pins = "PG12";
-               allwinner,function = "gpio_in";
-               allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-               allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+               pins = "PG12";
+               function = "gpio_in";
+               bias-pull-up;
        };
 };
 
@@ -250,8 +266,12 @@
 
 &spi2 {
        pinctrl-names = "default";
-       pinctrl-0 = <&spi2_pins_a>,
-                   <&spi2_cs0_pins_a>;
+       pinctrl-0 = <&spi2_pins_b>,
+                   <&spi2_cs0_pins_b>;
+       status = "okay";
+};
+
+&tcon0 {
        status = "okay";
 };
 
@@ -263,7 +283,7 @@
 
 &uart2 {
        pinctrl-names = "default";
-       pinctrl-0 = <&uart2_pins_a>;
+       pinctrl-0 = <&uart2_pins_b>;
        status = "okay";
 };
 
@@ -278,10 +298,6 @@
        status = "okay";
 };
 
-&usb0_vbus_pin_a {
-       allwinner,pins = "PG11";
-};
-
 &usbphy {
        pinctrl-names = "default";
        pinctrl-0 = <&usb0_id_detect_pin>;