ARM: DTS: Re-sync logicpd-som-lv with Linux 4.16-rc3

[oweals/u-boot.git] / arch / arm / dts / tegra20-harmony.dts

diff --git a/arch/arm/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts
index a8540d4e9cdb07a8cdaa43f20e173488d4f946af..0c907054dbd4afbf697ec8366f546ebe6876c191 100644 (file)
--- a/arch/arm/dts/tegra20-harmony.dts
+++ b/arch/arm/dts/tegra20-harmony.dts
@@ -15,10 +15,11 @@
                rtc0 = "/i2c@7000d000/tps6586x@34";
                rtc1 = "/rtc@7000e000";
                serial0 = &uartd;
-               usb0 = "/usb@c5008000";
+               usb0 = "/usb@c5000000";
                usb1 = "/usb@c5004000";
-               sdhci0 = "/sdhci@c8000600";
-               sdhci1 = "/sdhci@c8000200";
+               usb2 = "/usb@c5008000";
+               mmc0 = "/sdhci@c8000600";
+               mmc1 = "/sdhci@c8000200";
        };
 
        memory {
@@ -31,7 +32,23 @@
                        status = "okay";
                        rgb {
                                status = "okay";
-                               nvidia,panel = <&lcd_panel>;
+
+                               nvidia,panel = <&panel>;
+
+                               display-timings {
+                                       timing@0 {
+                                               /* Seaboard has 1366x768 */
+                                               clock-frequency = <42430000>;
+                                               hactive = <1024>;
+                                               vactive = <600>;
+                                               hback-porch = <138>;
+                                               hfront-porch = <34>;
+                                               hsync-len = <136>;
+                                               vback-porch = <21>;
+                                               vfront-porch = <4>;
+                                               vsync-len = <4>;
+                                       };
+                               };
                        };
                };
 
@@ -610,7 +627,8 @@
 
        usb@c5004000 {
                status = "okay";
-               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1) 0>;
+               nvidia,phy-reset-gpio = <&gpio TEGRA_GPIO(V, 1)
+                       GPIO_ACTIVE_LOW>;
        };
 
        usb-phy@c5004000 {
@@ -678,29 +696,13 @@
                };
        };
 
-       lcd_panel: panel {
-               clock = <42430000>;
-               xres = <1024>;
-               yres = <600>;
-               left-margin = <138>;
-               right-margin = <34>;
-               hsync-len = <136>;
-               lower-margin = <4>;
-               upper-margin = <21>;
-               vsync-len = <4>;
-               hsync-active-high;
-               vsyncx-active-high;
-               nvidia,bits-per-pixel = <16>;
-               nvidia,pwm = <&pwm 0 0>;
-               nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(B, 5)
-                                                       GPIO_ACTIVE_HIGH>;
-               nvidia,lvds-shutdown-gpios = <&gpio TEGRA_GPIO(B, 2)
-                                                       GPIO_ACTIVE_HIGH>;
-               nvidia,backlight-vdd-gpios = <&gpio TEGRA_GPIO(W, 0)
-                                                       GPIO_ACTIVE_HIGH>;
-               nvidia,panel-vdd-gpios = <&gpio TEGRA_GPIO(C, 6)
-                                                       GPIO_ACTIVE_HIGH>;
-               nvidia,panel-timings = <0 0 200 0 0>;
+       panel: panel {
+               compatible = "auo,b101aw03", "simple-panel";
+
+               power-supply = <&vdd_pnl_reg>;
+               enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
+
+               backlight = <&backlight>;
        };
 
        regulators {
@@ -810,3 +812,7 @@
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 };
+
+&uartd {
+       status = "okay";
+};