summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-whistler.c
diff options
context:
space:
mode:
authorTom Cherry <tcherry@nvidia.com>2010-12-15 14:13:09 -0800
committerBharat Nihalani <bnihalani@nvidia.com>2010-12-16 22:50:06 -0800
commitc941a8b190fd3cd2e2118ed6039511d8279952d9 (patch)
tree7a18c71cc9291b999a9115e7541733124965184c /arch/arm/mach-tegra/board-whistler.c
parentb6e60c1de3c59961789d0e74070d78bf05bfcd17 (diff)
tegra: whistler: Instantiate whistler touchscreen
Change-Id: Iba95aec378acaadf1b725affa5ceb5ce868b5358 Reviewed-on: http://git-master/r/13364 Tested-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-whistler.c')
-rw-r--r--arch/arm/mach-tegra/board-whistler.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c
index 329166dda357..45bc0fd67acd 100644
--- a/arch/arm/mach-tegra/board-whistler.c
+++ b/arch/arm/mach-tegra/board-whistler.c
@@ -26,7 +26,7 @@
#include <linux/clk.h>
#include <linux/serial_8250.h>
#include <linux/i2c.h>
-#include <linux/i2c/panjit_ts.h>
+#include <linux/synaptics_i2c_rmi.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
#include <linux/i2c-tegra.h>
@@ -167,6 +167,26 @@ static struct platform_device *whistler_devices[] __initdata = {
&tegra_wdt_device,
};
+static struct synaptics_i2c_rmi_platform_data synaptics_pdata= {
+ .flags = SYNAPTICS_FLIP_X | SYNAPTICS_FLIP_Y | SYNAPTICS_SWAP_XY,
+ .irqflags = IRQF_TRIGGER_LOW,
+};
+
+static const struct i2c_board_info whistler_i2c_touch_info[] = {
+ {
+ I2C_BOARD_INFO("synaptics-rmi-ts", 0x20),
+ .irq = TEGRA_GPIO_TO_IRQ(TEGRA_GPIO_PC6),
+ .platform_data = &synaptics_pdata,
+ },
+};
+
+static int __init whistler_touch_init(void)
+{
+ i2c_register_board_info(0, whistler_i2c_touch_info, 1);
+
+ return 0;
+}
+
static void __init tegra_whistler_init(void)
{
char serial[20];
@@ -184,6 +204,7 @@ static void __init tegra_whistler_init(void)
whistler_i2c_init();
whistler_regulator_init();
whistler_panel_init();
+ whistler_touch_init();
}
MACHINE_START(WHISTLER, "whistler")