History

Merge tag 'input-for-v6.14-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry Torokhov: - more conversions to the guard notation in the input core - a fix for NXP BBNSM power key driver to clean up wake IRQ after unbinding - several new vendor/device ID pairs added to xpad game controller driver - several drivers switched to using str_enable_disable and similar helpers instead of open-coding - add mapping for F23 to atkbd driver so that MS "Copilot" key shortcut works out of the box (if userspace is ready to handle it) - evbug input handler has been removed (debugging through evdev is strongly preferred to dumping all events into the kernel log). * tag 'input-for-v6.14-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (22 commits) Input: synaptics - fix crash when enabling pass-through port Input: atkbd - map F23 key to support default copilot shortcut Input: xpad - add support for Nacon Evol-X Xbox One Controller Input: xpad - add unofficial Xbox 360 wireless receiver clone Input: xpad - add support for wooting two he (arm) Input: xpad - improve name of 8BitDo controller 2dc8:3106 Input: xpad - add QH Electronics VID/PID Input: joystick - use str_off_on() helper in sw_connect() Input: Use str_enable_disable-like helpers Input: use guard notation in input core Input: poller - convert locking to guard notation Input: mt - make use of __free() cleanup facility Input: mt - convert locking to guard notation Input: ff-memless - make use of __free() cleanup facility Input: ff-memless - convert locking to guard notation Input: ff-core - make use of __free() cleanup facility Input: ff-core - convert locking to guard notation Input: remove evbug driver Input: mma8450 - add chip ID check in probe Input: bbnsm_pwrkey - add remove hook ...

Linus Torvalds committed 1 year ago

Commit 88e969f2 parents 27c0278 25768de22 files · +275 −468Browse files

Showing the changes to include/linux/platform_data (1 of 22 files). Show all

Unified · Split

include/linux/platform_data/keyscan-davinci.h+0−29
@@ -1,29 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0-or-later */
2/*
3 * Copyright (C) 2009 Texas Instruments, Inc
4 *
5 * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com>
6 */
7
8#ifndef DAVINCI_KEYSCAN_H
9#define DAVINCI_KEYSCAN_H
10
11#include <linux/io.h>
12
13enum davinci_matrix_types {
14 DAVINCI_KEYSCAN_MATRIX_4X4,
15 DAVINCI_KEYSCAN_MATRIX_5X3,
16};
17
18struct davinci_ks_platform_data {
19 int (*device_enable)(struct device *dev);
20 unsigned short *keymap;
21 u32 keymapsize;
22 u8 rep:1;
23 u8 strobe;
24 u8 interval;
25 u8 matrix_type;
26};
27
28#endif
29