diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-01 13:49:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-01 13:49:58 -0500 |
| commit | eea43ed86f38347979446905a20792a8be7bf5d1 (patch) | |
| tree | 74a3496eca9596e5502483f8e6bd95936d277057 /include/linux/platform_data | |
| parent | f6cff79f1d122f78a4b35bf4b2f0112afcd89ea4 (diff) | |
| parent | d67ad78e09cbb9935c74a40b85c5abe5b9cd48f8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input layer updates from Dmitry Torokhov:
- evdev interface has been adjusted to extend the life of timestamps on
32 bit systems to the year of 2108
- Synaptics RMI4 driver's PS/2 guest handling ha beed updated to
improve chances of detecting trackpoints on the pass-through port
- mms114 touchcsreen controller driver has been updated to support
generic device properties and work with mms152 cntrollers
- Goodix driver now supports generic touchscreen properties
- couple of drivers for AVR32 architecture are gone as the architecture
support has been removed from the kernel
- gpio-tilt driver has been removed as there are no mainline users and
the driver itself is using legacy APIs and relies on platform data
- MODULE_LINECSE/MODULE_VERSION cleanups
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)
Input: goodix - use generic touchscreen_properties
Input: mms114 - fix typo in definition
Input: mms114 - use BIT() macro instead of explicit shifting
Input: mms114 - replace mdelay with msleep
Input: mms114 - add support for mms152
Input: mms114 - drop platform data and use generic APIs
Input: mms114 - mark as direct input device
Input: mms114 - do not clobber interrupt trigger
Input: edt-ft5x06 - fix error handling for factory mode on non-M06
Input: stmfts - set IRQ_NOAUTOEN to the irq flag
Input: auo-pixcir-ts - delete an unnecessary return statement
Input: auo-pixcir-ts - remove custom log for a failed memory allocation
Input: da9052_tsi - remove unused mutex
Input: docs - use PROPERTY_ENTRY_U32() directly
Input: synaptics-rmi4 - log when we create a guest serio port
Input: synaptics-rmi4 - unmask F03 interrupts when port is opened
Input: synaptics-rmi4 - do not delete interrupt memory too early
Input: ad7877 - use managed resource allocations
Input: stmfts,s6sy671 - add SPDX identifier
Input: remove atmel-wm97xx touchscreen driver
...
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/mms114.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/include/linux/platform_data/mms114.h b/include/linux/platform_data/mms114.h deleted file mode 100644 index 5722ebfb2738..000000000000 --- a/include/linux/platform_data/mms114.h +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2012 Samsung Electronics Co.Ltd | ||
| 3 | * Author: Joonyoung Shim <jy0922.shim@samsung.com> | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License version 2 as | ||
| 7 | * published by the Free Software Foundationr | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef __LINUX_MMS114_H | ||
| 11 | #define __LINUX_MMS114_H | ||
| 12 | |||
| 13 | struct mms114_platform_data { | ||
| 14 | unsigned int x_size; | ||
| 15 | unsigned int y_size; | ||
| 16 | unsigned int contact_threshold; | ||
| 17 | unsigned int moving_threshold; | ||
| 18 | bool x_invert; | ||
| 19 | bool y_invert; | ||
| 20 | |||
| 21 | void (*cfg_pin)(bool); | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif /* __LINUX_MMS114_H */ | ||
