Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+12 -32
-1
MAINTAINERS
··· 4918 4918 L: linux-input@vger.kernel.org 4919 4919 S: Maintained 4920 4920 F: drivers/input/touchscreen/cyttsp* 4921 - F: include/linux/input/cyttsp.h 4922 4921 4923 4922 D-LINK DIR-685 TOUCHKEYS DRIVER 4924 4923 M: Linus Walleij <linus.walleij@linaro.org>
+8 -1
drivers/input/touchscreen/cyttsp_core.c
··· 46 46 #define CY_MAXZ 255 47 47 #define CY_DELAY_DFLT 20 /* ms */ 48 48 #define CY_DELAY_MAX 500 49 - #define CY_ACT_DIST_DFLT 0xF8 49 + /* Active distance in pixels for a gesture to be reported */ 50 + #define CY_ACT_DIST_DFLT 0xF8 /* pixels */ 50 51 #define CY_ACT_DIST_MASK 0x0F 52 + /* Active Power state scanning/processing refresh interval */ 53 + #define CY_ACT_INTRVL_DFLT 0x00 /* ms */ 54 + /* Low Power state scanning/processing refresh interval */ 55 + #define CY_LP_INTRVL_DFLT 0x0A /* ms */ 56 + /* touch timeout for the Active power */ 57 + #define CY_TCH_TMOUT_DFLT 0xFF /* ms */ 51 58 #define CY_HNDSHK_BIT 0x80 52 59 /* device mode bits */ 53 60 #define CY_OPERATE_MODE 0x00
-1
drivers/input/touchscreen/cyttsp_core.h
··· 22 22 #include <linux/module.h> 23 23 #include <linux/types.h> 24 24 #include <linux/device.h> 25 - #include <linux/input/cyttsp.h> 26 25 #include <linux/regulator/consumer.h> 27 26 28 27 #define CY_NUM_RETRY 16 /* max number of retries for read ops */
+2
drivers/input/touchscreen/cyttsp_i2c.c
··· 18 18 #include <linux/i2c.h> 19 19 #include <linux/input.h> 20 20 21 + #define CY_I2C_NAME "cyttsp-i2c" 22 + 21 23 #define CY_I2C_DATA_SIZE 128 22 24 23 25 static const struct cyttsp_bus_ops cyttsp_i2c_bus_ops = {
+2
drivers/input/touchscreen/cyttsp_spi.c
··· 20 20 #include <linux/input.h> 21 21 #include <linux/spi/spi.h> 22 22 23 + #define CY_SPI_NAME "cyttsp-spi" 24 + 23 25 #define CY_SPI_WR_OP 0x00 /* r/~w */ 24 26 #define CY_SPI_RD_OP 0x01 25 27 #define CY_SPI_CMD_BYTES 4
-29
include/linux/input/cyttsp.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0-only */ 2 - /* 3 - * Header file for: 4 - * Cypress TrueTouch(TM) Standard Product (TTSP) touchscreen drivers. 5 - * For use with Cypress Txx3xx parts. 6 - * Supported parts include: 7 - * CY8CTST341 8 - * CY8CTMA340 9 - * 10 - * Copyright (C) 2009, 2010, 2011 Cypress Semiconductor, Inc. 11 - * Copyright (C) 2012 Javier Martinez Canillas <javier@dowhile0.org> 12 - * 13 - * Contact Cypress Semiconductor at www.cypress.com (kev@cypress.com) 14 - */ 15 - #ifndef _CYTTSP_H_ 16 - #define _CYTTSP_H_ 17 - 18 - #define CY_SPI_NAME "cyttsp-spi" 19 - #define CY_I2C_NAME "cyttsp-i2c" 20 - /* Active Power state scanning/processing refresh interval */ 21 - #define CY_ACT_INTRVL_DFLT 0x00 /* ms */ 22 - /* touch timeout for the Active power */ 23 - #define CY_TCH_TMOUT_DFLT 0xFF /* ms */ 24 - /* Low Power state scanning/processing refresh interval */ 25 - #define CY_LP_INTRVL_DFLT 0x0A /* ms */ 26 - /* Active distance in pixels for a gesture to be reported */ 27 - #define CY_ACT_DIST_DFLT 0xF8 /* pixels */ 28 - 29 - #endif /* _CYTTSP_H_ */