aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2014-04-30 08:43:24 -0400
committerTony Lindgren <tony@atomide.com>2014-05-06 13:20:14 -0400
commit6cfcb5be9540074d40c34de78cc624adeea649f8 (patch)
tree037da48f3d852aa885c5cfeb8f00eff1783c8aee /arch
parent2cd1de1c2496b2ebc7e6484fd742bcdaaf57f4bb (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/am43x-epos-evm.dts12
1 files changed, 10 insertions, 2 deletions
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 @@
149 0x9c (PIN_INPUT_PULLUP | MUX_MODE3) 149 0x9c (PIN_INPUT_PULLUP | MUX_MODE3)
150 >; 150 >;
151 }; 151 };
152
153 pixcir_ts_pins: pixcir_ts_pins {
154 pinctrl-single,pins = <
155 0x44 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_a1.gpio1_17 */
156 >;
157 };
152 }; 158 };
153 159
154 matrix_keypad: matrix_keypad@0 { 160 matrix_keypad: matrix_keypad@0 {
@@ -237,7 +243,9 @@
237 }; 243 };
238 244
239 pixcir_ts@5c { 245 pixcir_ts@5c {
240 compatible = "pixcir,pixcir_ts"; 246 compatible = "pixcir,pixcir_tangoc";
247 pinctrl-names = "default";
248 pinctrl-0 = <&pixcir_ts_pins>;
241 reg = <0x5c>; 249 reg = <0x5c>;
242 interrupt-parent = <&gpio1>; 250 interrupt-parent = <&gpio1>;
243 interrupts = <17 0>; 251 interrupts = <17 0>;
@@ -245,7 +253,7 @@
245 attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>; 253 attb-gpio = <&gpio1 17 GPIO_ACTIVE_HIGH>;
246 254
247 x-size = <1024>; 255 x-size = <1024>;
248 y-size = <768>; 256 y-size = <600>;
249 }; 257 };
250}; 258};
251 259