From: Roger Quadros <rogerq@ti.com>
Date: Wed, 30 Apr 2014 12:43:24 +0000 (+0300)
Subject: ARM: dts: am43x-epos-evm: Correct Touch controller info
X-Git-Tag: v3.16-rc1~68^2~48
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=6cfcb5be9540074d40c34de78cc624adeea649f8;p=linux.git

ARM: dts: am43x-epos-evm: Correct Touch controller info

Fixup Y resolution and add default pin state. Also update
the compatible id.

CC: Benoit Cousson <bcousson@baylibre.com>
CC: Tony Lindgren <tony@atomide.com>
CC: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index ce5fc3909771..cf8bdf103a48 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -149,6 +149,12 @@ qspi1_default: qspi1_default {
 				0x9c (PIN_INPUT_PULLUP | MUX_MODE3)
 			>;
 		};
+
+		pixcir_ts_pins: pixcir_ts_pins {
+			pinctrl-single,pins = <
+				0x44 (PIN_INPUT_PULLUP | MUX_MODE7)	/* gpmc_a1.gpio1_17 */
+			>;
+		};
 	};
 
 	matrix_keypad: matrix_keypad@0 {
@@ -237,7 +243,9 @@ at24@50 {
 	};
 
 	pixcir_ts@5c {
-		compatible = "pixcir,pixcir_ts";
+		compatible = "pixcir,pixcir_tangoc";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pixcir_ts_pins>;
 		reg = <0x5c>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <17 0>;
@@ -245,7 +253,7 @@ pixcir_ts@5c {
 		attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
 
 		x-size = <1024>;
-		y-size = <768>;
+		y-size = <600>;
 	};
 };