aboutsummaryrefslogtreecommitdiff
path: root/include/linux/spi/ads7846.h
diff options
context:
space:
mode:
authorDmitry Torokhov <[email protected]>2021-11-11 21:58:54 -0800
committerDmitry Torokhov <[email protected]>2021-11-11 21:58:54 -0800
commitefe6f16c6faf724882ddaba2eda8830a87bcc2b2 (patch)
treeab5a4ac8c5b917b07af95c866770659f330b7f2b /include/linux/spi/ads7846.h
parenta02dcde595f7cbd240ccd64de96034ad91cffc40 (diff)
parent744d0090a5f6dfa4c81b53402ccdf08313100429 (diff)
Merge branch 'next' into for-linus
Prepare input updates for 5.16 merge window.
Diffstat (limited to 'include/linux/spi/ads7846.h')
-rw-r--r--include/linux/spi/ads7846.h15
1 files changed, 0 insertions, 15 deletions
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;