diff options
| author | Robert Collins <rcollins@nvidia.com> | 2011-06-06 14:57:01 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:08 -0800 |
| commit | 39719e13c46683a26ee9f325f7444d181be47be1 (patch) | |
| tree | 518a47ae5e53e3dfe623c3b17e8e34f258815660 /include/linux/i2c | |
| parent | 8d4a3af40d235e6e78a9ec8b04be999d4f0d23bd (diff) | |
Input: atmel_mxt_ts: Atmel customizations to touch.
Integrate changes made by Atmel. These changes are in addition to
mainline driver.
NOTE: Driver will compile as a stand-alone.
BUG 826854
Original-Change-Id: If13688d90d97b71718576f3fb756496f57a965d7
Reviewed-on: http://git-master/r/35280
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: Daniel Willemsen <dwillemsen@nvidia.com>
Rebase-Id: Reb8ae14299d248c0ce69e52b26a8816d1a0ee057
Diffstat (limited to 'include/linux/i2c')
| -rw-r--r-- | include/linux/i2c/atmel_mxt_ts.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/i2c/atmel_mxt_ts.h b/include/linux/i2c/atmel_mxt_ts.h index f027f7a63511..155cbe6ecd1d 100644 --- a/include/linux/i2c/atmel_mxt_ts.h +++ b/include/linux/i2c/atmel_mxt_ts.h @@ -2,6 +2,7 @@ * Atmel maXTouch Touchscreen driver * * Copyright (C) 2010 Samsung Electronics Co.Ltd + * Copyright (C) 2011 Atmel Corporation * Author: Joonyoung Shim <jy0922.shim@samsung.com> * * This program is free software; you can redistribute it and/or modify it @@ -39,6 +40,8 @@ struct mxt_platform_data { unsigned int voltage; unsigned char orient; unsigned long irqflags; + u8(*read_chg) (void); + unsigned long config_crc; }; #endif /* __LINUX_ATMEL_MXT_TS_H */ |