Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4412-trats2.dts

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index c16b315..9583563 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -71,6 +71,15 @@
                        enable-active-high;
                };
 
+               lcd_vdd3_reg: voltage-regulator-2 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "LCD_VDD_2.2V";
+                       regulator-min-microvolt = <2200000>;
+                       regulator-max-microvolt = <2200000>;
+                       gpio = <&gpc0 1 0>;
+                       enable-active-high;
+               };
+
                /* More to come */
        };
 
@@ -516,6 +525,67 @@
                };
        };
 
+       dsi_0: dsi@11C80000 {
+               vddcore-supply = <&ldo8_reg>;
+               vddio-supply = <&ldo10_reg>;
+               samsung,pll-clock-frequency = <24000000>;
+               status = "okay";
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@1 {
+                               reg = <1>;
+
+                               dsi_out: endpoint {
+                                       remote-endpoint = <&dsi_in>;
+                                       samsung,burst-clock-frequency = <500000000>;
+                                       samsung,esc-clock-frequency = <20000000>;
+                               };
+                       };
+               };
+
+               panel@0 {
+                       compatible = "samsung,s6e8aa0";
+                       reg = <0>;
+                       vdd3-supply = <&lcd_vdd3_reg>;
+                       vci-supply = <&ldo25_reg>;
+                       reset-gpios = <&gpy4 5 0>;
+                       power-on-delay= <50>;
+                       reset-delay = <100>;
+                       init-delay = <100>;
+                       flip-horizontal;
+                       flip-vertical;
+                       panel-width-mm = <58>;
+                       panel-height-mm = <103>;
+
+                       display-timings {
+                               timing-0 {
+                                       clock-frequency = <0>;
+                                       hactive = <720>;
+                                       vactive = <1280>;
+                                       hfront-porch = <5>;
+                                       hback-porch = <5>;
+                                       hsync-len = <5>;
+                                       vfront-porch = <13>;
+                                       vback-porch = <1>;
+                                       vsync-len = <2>;
+                               };
+                       };
+
+                       port {
+                               dsi_in: endpoint {
+                                       remote-endpoint = <&dsi_out>;
+                               };
+                       };
+               };
+       };
+
+       fimd@11c00000 {
+               status = "okay";
+       };
+
        camera {
                pinctrl-0 = <&cam_port_b_clk_active>;
                pinctrl-names = "default";