diff options
| author | Amy Maloche <amaloche@codeaurora.org> | 2013-12-12 10:35:39 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:57:58 -0700 |
| commit | 47058cc1afb4d54b401fb798f575bf5d9bd61519 (patch) | |
| tree | 5e31ac18bcd395144bc2a6d14abe4a196d1fb499 /include/linux | |
| parent | 708ce8696baccb396a240877419f3041e7160c7d (diff) | |
input: atmel_maxtouch_ts: squash commit from 3.14 kernel
Squash and apply the following touchscreen changes taken from the msm-3.14
kernel branch as of msm-3.14 commit 8139d0b
(ARM: dts: msm: Set flag to manage clks during suspend for msm8996)
421c2f3 input: touchscreen: atmel_maxtouch_ts: delay init call
48e0a07 input: atmel_maxtouch_ts: recover from bootloader
b3ebb61 input: atmel_maxtouch_ts: add support for force cfg update
8467fe3 input: atmel_maxtouch_ts: fix firmware update routines
c83ee59 input: atmel: Secure Touch support
1c7d5e2 input: atmel_maxtouch_ts: fix power up sequence
d4c1ffc input: atmel_maxtouch_ts: add support to ignore CRC
f402790 input: atmel_maxtouch_ts: add support for standard features
9374cef input: atmel_maxtouch_ts: use proper data types
0fbe83e input: atmel_maxtouch_ts: add regulator error conditions
e22d100 input: atmel_maxtouch_ts: add gpio support
63d4b74 input: atmel_maxtouch_ts: add device tree support
575c2fc input: atmel_maxtouch_ts: enable compilation on 3.10 kenrel
Signed-off-by: Alex Sarraf <asarraf@codeaurora.org>
Diffstat (limited to 'include/linux')
| -rwxr-xr-x | include/linux/input/atmel_maxtouch_ts.h | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/include/linux/input/atmel_maxtouch_ts.h b/include/linux/input/atmel_maxtouch_ts.h index 3422bd0d847b..adc359008c42 100755 --- a/include/linux/input/atmel_maxtouch_ts.h +++ b/include/linux/input/atmel_maxtouch_ts.h @@ -1,6 +1,11 @@ /* * Atmel maXTouch Touchscreen driver * + * Copyright (c) 2014, The Linux Foundation. All rights reserved. + * + * Linux foundation chooses to take subject only to the GPLv2 license terms, + * and distributes only under these terms. + * * Copyright (C) 2010 Samsung Electronics Co.Ltd * Author: Joonyoung Shim <jy0922.shim@samsung.com> * @@ -10,20 +15,47 @@ * option) any later version. */ -#ifndef __LINUX_ATMEL_MXT_TS_H -#define __LINUX_ATMEL_MXT_TS_H +#ifndef __LINUX_ATMEL_MAXTOUCH_TS_H +#define __LINUX_ATMEL_MAXTOUCH_TS_H #include <linux/types.h> /* The platform data for the Atmel maXTouch touchscreen driver */ struct mxt_platform_data { unsigned long irqflags; + unsigned long resetflags; + int gpio_reset; + int gpio_irq; + int gpio_i2cmode; 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 *fw_name; + bool ignore_crc; + + const struct mxt_config_info *config_array; + size_t config_array_size; + + /* touch panel's minimum and maximum coordinates */ + u32 panel_minx; + u32 panel_maxx; + u32 panel_miny; + u32 panel_maxy; + + /* display's minimum and maximum coordinates */ + u32 disp_minx; + u32 disp_maxx; + u32 disp_miny; + u32 disp_maxy; + + int *key_codes; + u8 bl_addr; + + u8(*read_chg) (void); + int (*init_hw) (bool); + int (*power_on) (bool); }; -#endif /* __LINUX_ATMEL_MXT_TS_H */ +#endif /* __LINUX_ATMEL_MAXTOUCH_TS_H */ |