diff options
| author | Evan Wilson <evan@oliodevices.com> | 2014-11-26 16:45:11 -0800 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-11-26 16:45:11 -0800 |
| commit | ee0be5d9ca8c41c69bb4283e96ffc872875b9ba8 (patch) | |
| tree | 2f7247ad51300ef772c5e21994fc74e502a10efd /include/linux/i2c | |
| parent | b15944ba232c8e0198e8086b4d4372a6fbd9dc87 (diff) | |
| parent | 15fd4c4259d19d0005d9cccb6ab2f85fbd4d6a02 (diff) | |
| download | olio-linux-3.10-ee0be5d9ca8c41c69bb4283e96ffc872875b9ba8.tar.xz olio-linux-3.10-ee0be5d9ca8c41c69bb4283e96ffc872875b9ba8.zip | |
Merge remote-tracking branch 'atmel-maxtouch/maxtouch-v3.10' into android-3.10-bringup
Change-Id: Iea94511ceb93f68a94a9e57d5651c1e01dfe6f71
Diffstat (limited to 'include/linux/i2c')
| -rw-r--r-- | include/linux/i2c/atmel_mxt_ts.h | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/include/linux/i2c/atmel_mxt_ts.h b/include/linux/i2c/atmel_mxt_ts.h index 99e379b7439..bc74c3f4c86 100644 --- a/include/linux/i2c/atmel_mxt_ts.h +++ b/include/linux/i2c/atmel_mxt_ts.h @@ -15,35 +15,16 @@ #include <linux/types.h> -/* For key_map array */ -#define MXT_NUM_GPIO 4 - -/* Orient */ -#define MXT_NORMAL 0x0 -#define MXT_DIAGONAL 0x1 -#define MXT_HORIZONTAL_FLIP 0x2 -#define MXT_ROTATED_90_COUNTER 0x3 -#define MXT_VERTICAL_FLIP 0x4 -#define MXT_ROTATED_90 0x5 -#define MXT_ROTATED_180 0x6 -#define MXT_DIAGONAL_COUNTER 0x7 - /* The platform data for the Atmel maXTouch touchscreen driver */ struct mxt_platform_data { - const u8 *config; - size_t config_length; - - unsigned int x_line; - unsigned int y_line; - unsigned int x_size; - unsigned int y_size; - unsigned int blen; - unsigned int threshold; - unsigned int voltage; - unsigned char orient; unsigned long irqflags; - bool is_tp; - const unsigned int key_map[MXT_NUM_GPIO]; + u8 t19_num_keys; + const unsigned int *t19_keymap; + int t15_num_keys; + const unsigned int *t15_keymap; + unsigned long gpio_reset; + const char *cfg_name; + const char *input_name; }; #endif /* __LINUX_ATMEL_MXT_TS_H */ |