summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJing Lin <jinglin@codeaurora.org>2015-09-14 16:31:08 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:51:34 -0700
commite897567177bb5dd5c18b5d65594fa4e5bf974e6f (patch)
tree95f898797e92d4a0a5c15c51dbdb768d8a4eb733 /drivers/input
parentbf4d97091667121ba15f7539db1b43351f7276b1 (diff)
input: maxim_sti: move header to uapi
Move kernel data structures to driver and keep the data structures shared between kernel and user space in the header file. Move the header to uapi to make it accesible to user space. Fix checkpatch errors to replace deprecated functions and hardcoded error return values. Change-Id: Ic3312c11ddda9f02da9807a6243206d582281995 Signed-off-by: Jing Lin <jinglin@codeaurora.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/maxim_sti.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c
index c97615923802..0ab796f305ae 100644
--- a/drivers/input/touchscreen/maxim_sti.c
+++ b/drivers/input/touchscreen/maxim_sti.c
@@ -27,7 +27,9 @@
#include <linux/interrupt.h>
#include <linux/input.h>
#include <linux/regulator/consumer.h>
-#include <linux/input/maxim_sti.h>
+#include <net/genetlink.h>
+#include <net/sock.h>
+#include <uapi/linux/maxim_sti.h>
#include <asm/byteorder.h> /* MUST include this header to get byte order */
#ifdef CONFIG_OF
#include <linux/gpio.h>
@@ -57,6 +59,24 @@
/****************************************************************************\
* Device context structure, globals, and macros *
\****************************************************************************/
+#define MAXIM_STI_NAME "maxim_sti"
+
+struct maxim_sti_pdata {
+ char *touch_fusion;
+ char *config_file;
+ char *nl_family;
+ char *fw_name;
+ u32 nl_mc_groups;
+ u32 chip_access_method;
+ u32 default_reset_state;
+ u32 tx_buf_size;
+ u32 rx_buf_size;
+ int gpio_reset;
+ int gpio_irq;
+ int (*init)(struct maxim_sti_pdata *pdata, bool init);
+ void (*reset)(struct maxim_sti_pdata *pdata, int value);
+ int (*irq)(struct maxim_sti_pdata *pdata);
+};
struct dev_data;