Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov:
 "A tiny pull request this merge window unfortunately, should get more
  material in for the next release:

   - new driver for Raspberry Pi's touchscreen (firmware interface)

   - miscellaneous input driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: elan_i2c - add ACPI ID for touchpad in ASUS Aspire F5-573G
  Input: atmel_mxt_ts - don't try to free unallocated kernel memory
  Input: drv2667 - fix indentation issues
  Input: touchscreen - fix coding style issue
  Input: add official Raspberry Pi's touchscreen driver
  Input: nomadik-ske-keypad - fix a loop timeout test
  Input: rotary-encoder - don't log EPROBE_DEFER to kernel log
  Input: olpc_apsp - remove set but not used variable 'np'
  Input: olpc_apsp - enable the SP clock
  Input: olpc_apsp - check FIFO status on open(), not probe()
  Input: olpc_apsp - drop CONFIG_OLPC dependency
  clk: mmp2: add SP clock
  dt-bindings: marvell,mmp2: Add clock id for the SP clock
  Input: ad7879 - drop platform data support

1 files changed, 0 insertions, 42 deletions

diff --git a/include/linux/platform_data/ad7879.h b/include/linux/platform_data/ad7879.h
deleted file mode 100644
index 6655cc8453ac..000000000000
--- a/include/linux/platform_data/ad7879.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* linux/platform_data/ad7879.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.
- */
-struct ad7879_platform_data {
-        u16     model;                  /* 7879 */
-        u16     x_plate_ohms;
-        u16     x_min, x_max;
-        u16     y_min, y_max;
-        u16     pressure_min, pressure_max;
-
-        bool    swap_xy;                /* swap x and y axes */
-
-        /* [0..255] 0=OFF Starts at 1=550us and goes
-         * all the way to 9.440ms in steps of 35us.
-         */
-        u8      pen_down_acc_interval;
-        /* [0..15] Starts at 0=128us and goes all the
-         * way to 4.096ms in steps of 128us.
-         */
-        u8      first_conversion_delay;
-        /* [0..3] 0 = 2us, 1 = 4us, 2 = 8us, 3 = 16us */
-        u8      acquisition_time;
-        /* [0..3] Average X middle samples 0 = 2, 1 = 4, 2 = 8, 3 = 16 */
-        u8      averaging;
-        /* [0..3] Perform X measurements 0 = OFF,
-         * 1 = 4, 2 = 8, 3 = 16 (median > averaging)
-         */
-        u8      median;
-        /* 1 = AUX/VBAT/GPIO export GPIO to gpiolib
-         * requires CONFIG_GPIOLIB
-         */
-        bool    gpio_export;
-        /* identifies the first GPIO number handled by this chip;
-         * or, if negative, requests dynamic ID allocation.
-         */
-        s32     gpio_base;
-};