Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/arch/arm/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts
index 0ce46aebcbc070fe3dcae3977ecbea1613d6c0a0..85cd1e39bda7739dd2de118c0965ab77f61b9ad6 100644 (file)
--- a/arch/arm/dts/tegra20-ventana.dts
+++ b/arch/arm/dts/tegra20-ventana.dts
@@ -15,9 +15,11 @@
                rtc0 = "/i2c@7000d000/tps6586x@34";
                rtc1 = "/rtc@7000e000";
                serial0 = &uartd;
-               usb0 = "/usb@c5008000";
-               sdhci0 = "/sdhci@c8000600";
-               sdhci1 = "/sdhci@c8000400";
+               usb0 = "/usb@c5000000";
+               usb1 = "/usb@c5004000";
+               usb2 = "/usb@c5008000";
+               mmc0 = "/sdhci@c8000600";
+               mmc1 = "/sdhci@c8000400";
        };
 
        memory {
@@ -30,7 +32,24 @@
                        status = "okay";
                        rgb {
                                status = "okay";
-                               nvidia,panel = <&lcd_panel>;
+
+                               nvidia,panel = <&panel>;
+
+                               display-timings {
+                                       timing@0 {
+                                               /* Seaboard has 1366x768 */
+                                               clock-frequency = <70600000>;
+                                               hactive = <1366>;
+                                               vactive = <768>;
+                                               hback-porch = <58>;
+                                               hfront-porch = <58>;
+                                               hsync-len = <58>;
+                                               vback-porch = <4>;
+                                               vfront-porch = <4>;
+                                               vsync-len = <4>;
+                                               hsync-active = <1>;
+                                       };
+                               };
                        };
                };
 
@@ -613,6 +632,16 @@
                };
        };
 
+       panel: panel {
+               compatible = "chunghwa,claa101wa01a", "simple-panel";
+
+               power-supply = <&vdd_pnl_reg>;
+               enable-gpios = <&gpio TEGRA_GPIO(B, 2) GPIO_ACTIVE_HIGH>;
+
+               backlight = <&backlight>;
+               ddc-i2c-bus = <&lvds_ddc>;
+       };
+
        regulators {
                compatible = "simple-bus";
                #address-cells = <1>;
@@ -667,31 +696,6 @@
                };
        };
 
-       lcd_panel: panel {
-               clock = <72072000>;
-               xres = <1366>;
-               yres = <768>;
-               left-margin = <58>;
-               right-margin = <58>;
-               hsync-len = <58>;
-               lower-margin = <4>;
-               upper-margin = <4>;
-               vsync-len = <4>;
-               hsync-active-high;
-               vsync-active-high;
-               nvidia,bits-per-pixel = <16>;
-               nvidia,pwm = <&pwm 2 0>;
-               nvidia,backlight-enable-gpios = <&gpio TEGRA_GPIO(D, 4)
-                                                       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>;
-       };
-
        sound {
                compatible = "nvidia,tegra-audio-wm8903-ventana",
                             "nvidia,tegra-audio-wm8903";