diff options
| author | Dmitry Torokhov | 2021-06-01 16:37:54 -0700 |
|---|---|---|
| committer | Dmitry Torokhov | 2021-06-01 21:13:11 -0700 |
| commit | d27ac0fba71cfd4da45f1ba6564f32ddd2914cc4 (patch) | |
| tree | 7cb0a78486af84e9417855abe7e8e5e3d49af943 /drivers/input | |
| parent | 0ff5cd50c48c267c5e52bfbf6ee1683049774ca6 (diff) | |
Input: cyttsp - remove public header
There is nothing in include/linux/input/cyttsp.h that might be of interes
to the kernel at large, so let's move this information into the driver
code and remove the header.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210531052307.1433979-2-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/cyttsp_core.c | 9 | ||||
| -rw-r--r-- | drivers/input/touchscreen/cyttsp_core.h | 1 | ||||
| -rw-r--r-- | drivers/input/touchscreen/cyttsp_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/input/touchscreen/cyttsp_spi.c | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c index a6352d79e23d..1dbd849c9613 100644 --- a/drivers/input/touchscreen/cyttsp_core.c +++ b/drivers/input/touchscreen/cyttsp_core.c @@ -46,8 +46,15 @@ #define CY_MAXZ 255 #define CY_DELAY_DFLT 20 /* ms */ #define CY_DELAY_MAX 500 -#define CY_ACT_DIST_DFLT 0xF8 +/* Active distance in pixels for a gesture to be reported */ +#define CY_ACT_DIST_DFLT 0xF8 /* pixels */ #define CY_ACT_DIST_MASK 0x0F +/* Active Power state scanning/processing refresh interval */ +#define CY_ACT_INTRVL_DFLT 0x00 /* ms */ +/* Low Power state scanning/processing refresh interval */ +#define CY_LP_INTRVL_DFLT 0x0A /* ms */ +/* touch timeout for the Active power */ +#define CY_TCH_TMOUT_DFLT 0xFF /* ms */ #define CY_HNDSHK_BIT 0x80 /* device mode bits */ #define CY_OPERATE_MODE 0x00 diff --git a/drivers/input/touchscreen/cyttsp_core.h b/drivers/input/touchscreen/cyttsp_core.h index 8eba9d8ba74a..075509e695a2 100644 --- a/drivers/input/touchscreen/cyttsp_core.h +++ b/drivers/input/touchscreen/cyttsp_core.h @@ -22,7 +22,6 @@ #include <linux/module.h> #include <linux/types.h> #include <linux/device.h> -#include <linux/input/cyttsp.h> #include <linux/regulator/consumer.h> #define CY_NUM_RETRY 16 /* max number of retries for read ops */ diff --git a/drivers/input/touchscreen/cyttsp_i2c.c b/drivers/input/touchscreen/cyttsp_i2c.c index 0a09f07bc23a..4c8473d327ab 100644 --- a/drivers/input/touchscreen/cyttsp_i2c.c +++ b/drivers/input/touchscreen/cyttsp_i2c.c @@ -18,6 +18,8 @@ #include <linux/i2c.h> #include <linux/input.h> +#define CY_I2C_NAME "cyttsp-i2c" + #define CY_I2C_DATA_SIZE 128 static const struct cyttsp_bus_ops cyttsp_i2c_bus_ops = { diff --git a/drivers/input/touchscreen/cyttsp_spi.c b/drivers/input/touchscreen/cyttsp_spi.c index 8715e5354d79..30c6fbf86a86 100644 --- a/drivers/input/touchscreen/cyttsp_spi.c +++ b/drivers/input/touchscreen/cyttsp_spi.c @@ -20,6 +20,8 @@ #include <linux/input.h> #include <linux/spi/spi.h> +#define CY_SPI_NAME "cyttsp-spi" + #define CY_SPI_WR_OP 0x00 /* r/~w */ #define CY_SPI_RD_OP 0x01 #define CY_SPI_CMD_BYTES 4 |