summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRobert Collins <rcollins@nvidia.com>2011-06-15 14:43:41 -0700
committerNiket Sirsi <nsirsi@nvidia.com>2011-06-24 20:56:45 -0700
commit3bcb22dec581875cc5497433019472c8ee915acc (patch)
tree162a4822fd8fea370bc68b25fb46c822761682d5 /include
parent93a08e77440b09b254fb18c5eb4350dd5efbeff0 (diff)
Input: atmel_mxt_touch: NVIDIA touch customization
* Fix suspend/resume bug to prevent unecessary i2cinterrupts when suspended. * Change input device name to match NVDA IDC name. * Add I2C address defines. * Change "printk" to "dev_info" function calls. BUG 826854 Change-Id: Ic1b25bc469b86d8a26e876e80973597d9f6fb107 Reviewed-on: http://git-master/r/35285 Reviewed-by: Robert R Collins <rcollins@nvidia.com> Tested-by: Robert R Collins <rcollins@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Narendra Damahe <ndamahe@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/i2c/atmel_mxt_ts.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/i2c/atmel_mxt_ts.h b/include/linux/i2c/atmel_mxt_ts.h
index 155cbe6ecd1d..9b43e249ed9c 100644
--- a/include/linux/i2c/atmel_mxt_ts.h
+++ b/include/linux/i2c/atmel_mxt_ts.h
@@ -3,6 +3,7 @@
*
* Copyright (C) 2010 Samsung Electronics Co.Ltd
* Copyright (C) 2011 Atmel Corporation
+ * Copyright (C) 2011 NVIDIA Corporation
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
*
* This program is free software; you can redistribute it and/or modify it
@@ -16,6 +17,16 @@
#include <linux/types.h>
+/*
+ * Atmel I2C addresses
+ */
+#define MXT224_I2C_ADDR1 0x4A
+#define MXT224_I2C_ADDR2 0x4B
+#define MXT1386_I2C_ADDR1 0x4C
+#define MXT1386_I2C_ADDR2 0x4D
+#define MXT1386_I2C_ADDR3 0x5A
+#define MXT1386_I2C_ADDR4 0x5B
+
/* Orient */
#define MXT_NORMAL 0x0
#define MXT_DIAGONAL 0x1