From 72436be454654749d7c64676543ae6e7a579b042 Mon Sep 17 00:00:00 2001 From: Mohan Pallaka Date: Tue, 13 Aug 2013 16:11:47 +0530 Subject: input: ft5x06_ts: Parse board specific parameters from pdata To support all models supported by focaltech push necessary parameters to platform data. This patch is propagated from msm-3.18 kernel 'commit 473f8cd84f93 ("input: ft5x06_ts: Parse board specific parameters from pdata")' Also fix the below checkpatch warnings on 3.18 Kernel. WARNING: Possible unnecessary 'out of memory' message + if (!data) { + dev_err(&client->dev, "Not enough memory\n"); WARNING: Possible unnecessary 'out of memory' message + if (!data->ts_info) { + dev_err(&client->dev, "Not enough memory\n"); Change-Id: I00b0e8ba7cfc8d8fbd48aa910bd3d0010283ed00 Signed-off-by: Mohan Pallaka Signed-off-by: Sudhakar Manapati --- include/linux/input/ft5x06_ts.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'include/linux') diff --git a/include/linux/input/ft5x06_ts.h b/include/linux/input/ft5x06_ts.h index 08ccbc9bd71c..89e3143eda77 100644 --- a/include/linux/input/ft5x06_ts.h +++ b/include/linux/input/ft5x06_ts.h @@ -23,7 +23,20 @@ #define FT5X36_ID 0x14 #define FT6X06_ID 0x06 +struct fw_upgrade_info { + bool auto_cal; + u16 delay_aa; + u16 delay_55; + u8 upgrade_id_1; + u8 upgrade_id_2; + u16 delay_readid; + u16 delay_erase_flash; +}; + struct ft5x06_ts_platform_data { + struct fw_upgrade_info info; + const char *name; + const char *fw_name; u32 irqflags; u32 irq_gpio; u32 irq_gpio_flags; @@ -38,6 +51,10 @@ struct ft5x06_ts_platform_data { u32 panel_miny; u32 panel_maxx; u32 panel_maxy; + u32 group_id; + u32 hard_rst_dly; + u32 soft_rst_dly; + u32 num_max_touches; bool no_force_update; bool i2c_pull_up; int (*power_init)(bool); -- cgit v1.2.3