From a890097d685759e00b16025336703b1e53bf0a0e Mon Sep 17 00:00:00 2001
From: Tomasz Figa <t.figa@samsung.com>
Date: Tue, 20 Nov 2012 16:26:18 +0900
Subject: [PATCH] --- yaml --- r: 342306 b: refs/heads/master c:
 0d09bf69fc9f99f0d56c420acb1abb018292632c h: refs/heads/master v: v3

---
 [refs]                                       |  2 +-
 trunk/arch/arm/boot/dts/exynos4210-trats.dts | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b3bba7b226e..a63f47ff351c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50528aa1473a2e5d2cb1a82641afa3aa269e3ddc
+refs/heads/master: 0d09bf69fc9f99f0d56c420acb1abb018292632c
diff --git a/trunk/arch/arm/boot/dts/exynos4210-trats.dts b/trunk/arch/arm/boot/dts/exynos4210-trats.dts
index 5dfd231a98e9..dab2e0865cc9 100644
--- a/trunk/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/trunk/arch/arm/boot/dts/exynos4210-trats.dts
@@ -114,6 +114,17 @@
 		pinctrl-0 = <&i2c3_bus>;
 		pinctrl-names = "default";
 		status = "okay";
+
+		mms114-touchscreen@48 {
+			compatible = "melfas,mms114";
+			reg = <0x48>;
+			interrupt-parent = <&gpx0>;
+			interrupts = <4 2>;
+			x-size = <720>;
+			y-size = <1280>;
+			avdd-supply = <&tsp_reg>;
+			vdd-supply = <&tsp_reg>;
+		};
 	};
 
 	i2c@138B0000 {