From 358da51dda67c6747d8ff119d1311636ceacb7a5 Mon Sep 17 00:00:00 2001 From: Mohan Pallaka Date: Wed, 12 Feb 2014 15:17:28 -0800 Subject: input: synaptics_dsx: 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 3bc54cf86b (Merge "msm: camera: Add dummy sub module in sensor pipeline") b20792c2 input: synaptics_dsx: Fix security issues 4f3ec831 input: synaptics_dsx: Remove use of deprecated INIT_COMPLETION 8c5bd97f input: synaptics_dsx: change permission for sysfs secure_touch_enable b22c0b56 input: synaptics_dsx: reconfigure resolution in suspend 0ea26697 touchscreen: synaptics_dsx: set absolute axes for touchscreen 6a021e0a input: synaptics_dsx: handle all controller interrupts d3de3ed6 input: synaptics_dsx: remove query operation from reinit 2285a8dd input: synaptics_dsx: remove vkey kobject in remove 6817aed5 input: synaptics: Fix to secure touch clock unbalance 44a84a1e input: synaptics_dsx: support for pm ops 41439903 input: synaptics: add support for unprogrammed panels b029351d input: synaptics: remove outdated header d065c5e0 input: synaptics: add ability to distinguish touch part 72ca30da input: synaptics_dsx: release pinctrl resources on probe failure 0ab5f1e5 input: synaptics: add NULL pointer check ad4102c8 input: synaptics: Secure touch clocks 6a77bbed input: synaptics_dsx: fix compilation warning when !CONFIG_PM_* f3488933 input: synaptics_dsx: reorder device resume sequence 71b65447 input: synaptics_dsx: add support for 2D sensor for soft-keys 610ecdc2 input: synaptics_dsx: fix data sysfs read-write permission 06195779 input: synaptics_dsx: fix up world writable sysfs file 995ed76d input: synaptics_dsx: add ability to identify controller 69a416fe input: synaptic_dsx: configure touch panel boundary coordinates 609eb34b input: synaptics_dsx: correct sysfs permissions 59af5ffb input: synaptics_dsx: remove firmware update at boot 13b71e2f input: synaptic_dsx: stay awake the device during firmware update dccee682 input: synaptic_dsx: add sysfs entry for force firmware update a4d13992 input: synaptics: secure touch support 11c70731 input: synaptic_dsx: add debugfs support for suspend/resume 2642f2cb input: synaptics_dsx: add standard features for touch support 72f05e70 input: synaptics_dsx: add dual regulator support ab390caa input: synaptics_dsx: add device tree support 51898424 input: synaptics_dsx: fix conflicts with other drivers Signed-off-by: Alex Sarraf --- include/linux/input/synaptics_dsx_v2.h | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'include/linux') diff --git a/include/linux/input/synaptics_dsx_v2.h b/include/linux/input/synaptics_dsx_v2.h index dc6e6be28ceb..fe293f5b99c7 100755 --- a/include/linux/input/synaptics_dsx_v2.h +++ b/include/linux/input/synaptics_dsx_v2.h @@ -34,6 +34,16 @@ struct synaptics_dsx_cap_button_map { unsigned char *map; }; +/* + * struct synaptics_virtual_key_map - 2d button map + * @nkeys: number of virtual keys + * @map: pointer to array of virtual keys + */ +struct synaptics_rmi4_virtual_key_map { + unsigned char nkeys; + unsigned int *map; +}; + /* * struct synaptics_dsx_board_data - dsx board data * @x_flip: x flip flag @@ -60,11 +70,12 @@ struct synaptics_dsx_board_data { bool y_flip; bool swap_axes; int irq_gpio; + u32 irq_flags; int power_gpio; int power_on_state; int reset_gpio; + u32 reset_flags; int reset_on_state; - unsigned long irq_flags; unsigned int panel_x; unsigned int panel_y; unsigned int power_delay_ms; @@ -73,8 +84,21 @@ struct synaptics_dsx_board_data { unsigned int byte_delay_us; unsigned int block_delay_us; unsigned char *regulator_name; + unsigned int package_id; int (*gpio_config)(int gpio, bool configure, int dir, int state); struct synaptics_dsx_cap_button_map *cap_button_map; + struct synaptics_rmi4_virtual_key_map *virtual_key_map; + u32 panel_minx; + u32 panel_miny; + u32 panel_maxx; + u32 panel_maxy; + u32 disp_minx; + u32 disp_miny; + u32 disp_maxx; + u32 disp_maxy; + bool disable_gpios; + bool detect_device; + const char *fw_name; }; #endif -- cgit v1.2.3