summaryrefslogtreecommitdiff
path: root/include/linux/i2c
diff options
context:
space:
mode:
authorRobert Collins <rcollins@nvidia.com>2011-06-15 14:43:41 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:47:08 -0800
commit4e8c72b0280cba496c8397b80c363deebdd88717 (patch)
tree4b8cc66c3d43c440642b7e6840c7fcce67f0fde8 /include/linux/i2c
parent39719e13c46683a26ee9f325f7444d181be47be1 (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 Original-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> Rebase-Id: Rcba51c79d3c004372c0be18538f14f56a2249bc0
Diffstat (limited to 'include/linux/i2c')
-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