From 6c0bb7161256d1d416b49af7775e18357d0ab84e Mon Sep 17 00:00:00 2001
From: Vikas Sajjan <vikas.sajjan@linaro.org>
Date: Mon, 8 Apr 2013 15:48:16 +0900
Subject: [PATCH] --- yaml --- r: 374106 b: refs/heads/master c:
 0207775d6ff7e6a6eddb9931f9328f0f0173a338 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/boot/dts/exynos4412-origen.dts | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2041b81fbedd..76c9f0ca9a19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 768c3a567e6ca7b8bf7db6753a87a1f64e414840
+refs/heads/master: 0207775d6ff7e6a6eddb9931f9328f0f0173a338
diff --git a/trunk/arch/arm/boot/dts/exynos4412-origen.dts b/trunk/arch/arm/boot/dts/exynos4412-origen.dts
index a5478bd20a60..b39bffccde86 100644
--- a/trunk/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/trunk/arch/arm/boot/dts/exynos4412-origen.dts
@@ -70,6 +70,27 @@
 		status = "okay";
 	};
 
+	fimd@11c00000 {
+		pinctrl-0 = <&lcd_clk &lcd_data24 &pwm1_out>;
+		pinctrl-names = "default";
+		status = "okay";
+	};
+
+	display-timings {
+		native-mode = <&timing0>;
+		timing0: timing {
+			clock-frequency = <50000>;
+			hactive = <1024>;
+			vactive = <600>;
+			hfront-porch = <64>;
+			hback-porch = <16>;
+			hsync-len = <48>;
+			vback-porch = <64>;
+			vfront-porch = <16>;
+			vsync-len = <3>;
+		};
+	};
+
 	serial@13800000 {
 		status = "okay";
 	};