diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-11-11 21:58:54 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-11-11 21:58:54 -0800 |
| commit | efe6f16c6faf724882ddaba2eda8830a87bcc2b2 (patch) | |
| tree | ab5a4ac8c5b917b07af95c866770659f330b7f2b /include | |
| parent | Input: touchscreen - avoid bitwise vs logical OR warning (diff) | |
| parent | Input: iforce - fix control-message timeout (diff) | |
| download | wireguard-linux-efe6f16c6faf724882ddaba2eda8830a87bcc2b2.tar.xz wireguard-linux-efe6f16c6faf724882ddaba2eda8830a87bcc2b2.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.16 merge window.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/input/cy8ctmg110_pdata.h | 10 | ||||
| -rw-r--r-- | include/linux/spi/ads7846.h | 15 |
2 files changed, 0 insertions, 25 deletions
diff --git a/include/linux/input/cy8ctmg110_pdata.h b/include/linux/input/cy8ctmg110_pdata.h deleted file mode 100644 index ee1d44545f30..000000000000 --- a/include/linux/input/cy8ctmg110_pdata.h +++ /dev/null @@ -1,10 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_CY8CTMG110_PDATA_H -#define _LINUX_CY8CTMG110_PDATA_H - -struct cy8ctmg110_pdata -{ - int reset_pin; /* Reset pin is wired to this GPIO (optional) */ -}; - -#endif diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h index 1a5eaef3b7f2..d424c1aadf38 100644 --- a/include/linux/spi/ads7846.h +++ b/include/linux/spi/ads7846.h @@ -1,17 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* linux/spi/ads7846.h */ -/* Touchscreen characteristics vary between boards and models. The - * platform_data for the device's "struct device" holds this information. - * - * It's OK if the min/max values are zero. - */ -enum ads7846_filter { - ADS7846_FILTER_OK, - ADS7846_FILTER_REPEAT, - ADS7846_FILTER_IGNORE, -}; - struct ads7846_platform_data { u16 model; /* 7843, 7845, 7846, 7873. */ u16 vref_delay_usecs; /* 0 for external vref; etc */ @@ -51,10 +40,6 @@ struct ads7846_platform_data { int gpio_pendown_debounce; /* platform specific debounce time for * the gpio_pendown */ int (*get_pendown_state)(void); - int (*filter_init) (const struct ads7846_platform_data *pdata, - void **filter_data); - int (*filter) (void *filter_data, int data_idx, int *val); - void (*filter_cleanup)(void *filter_data); void (*wait_for_sync)(void); bool wakeup; unsigned long irq_flags; |