mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 11:33:36 -04:00
Merge tag 'input-for-v6.12-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - support for PixArt PS/2 touchpad - updates to tsc2004/5, usbtouchscreen, and zforce_ts drivers - support for GPIO-only mode for ADP55888 controller - support for touch keys in Zinitix driver - support for querying density of Synaptics sensors - sysfs interface for Goodex "Berlin" devices to read and write touch IC registers - more quirks to i8042 to handle various Tuxedo laptops - a number of drivers have been converted to using "guard" notation when acquiring various locks, as well as using other cleanup functions to simplify releasing of resources (with more drivers to follow) - evdev will limit amount of data that can be written into an evdev instance at a given time to 4096 bytes (170 input events) to avoid holding evdev->mutex for too long and starving other users - Spitz has been converted to use software nodes/properties to describe its matrix keypad and GPIO-connected LEDs - msc5000_ts, msc_touchkey and keypad-nomadik-ske drivers have been removed since noone in mainline have been using them - other assorted cleanups and fixes * tag 'input-for-v6.12-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (98 commits) ARM: spitz: fix compile error when matrix keypad driver is enabled Input: hynitron_cstxxx - drop explicit initialization of struct i2c_device_id::driver_data to 0 Input: adp5588-keys - fix check on return code Input: Convert comma to semicolon Input: i8042 - add TUXEDO Stellaris 15 Slim Gen6 AMD to i8042 quirk table Input: i8042 - add another board name for TUXEDO Stellaris Gen5 AMD line Input: tegra-kbc - use of_property_read_variable_u32_array() and of_property_present() Input: ps2-gpio - use IRQF_NO_AUTOEN flag in request_irq() Input: ims-pcu - fix calling interruptible mutex Input: zforce_ts - switch to using asynchronous probing Input: zforce_ts - remove assert/deassert wrappers Input: zforce_ts - do not hardcode interrupt level Input: zforce_ts - switch to using devm_regulator_get_enable() Input: zforce_ts - stop treating VDD regulator as optional Input: zforce_ts - make zforce_idtable constant Input: zforce_ts - use dev_err_probe() where appropriate Input: zforce_ts - do not ignore errors when acquiring regulator Input: zforce_ts - make parsing of contacts less confusing Input: zforce_ts - switch to using get_unaligned_le16 Input: zforce_ts - use guard notation when acquiring mutexes ...
This commit is contained in:
Linus Torvalds
@@ -1,62 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* Header file for:
|
||||
* Cypress TrueTouch(TM) Standard Product (TTSP) touchscreen drivers.
|
||||
* For use with Cypress Txx3xx parts.
|
||||
* Supported parts include:
|
||||
* CY8CTST341
|
||||
* CY8CTMA340
|
||||
*
|
||||
* Copyright (C) 2009, 2010, 2011 Cypress Semiconductor, Inc.
|
||||
* Copyright (C) 2012 Javier Martinez Canillas <javier@dowhile0.org>
|
||||
*
|
||||
* Contact Cypress Semiconductor at www.cypress.com (kev@cypress.com)
|
||||
*/
|
||||
#ifndef _CYTTSP4_H_
|
||||
#define _CYTTSP4_H_
|
||||
|
||||
#define CYTTSP4_MT_NAME "cyttsp4_mt"
|
||||
#define CYTTSP4_I2C_NAME "cyttsp4_i2c_adapter"
|
||||
#define CYTTSP4_SPI_NAME "cyttsp4_spi_adapter"
|
||||
|
||||
#define CY_TOUCH_SETTINGS_MAX 32
|
||||
|
||||
struct touch_framework {
|
||||
const uint16_t *abs;
|
||||
uint8_t size;
|
||||
uint8_t enable_vkeys;
|
||||
} __packed;
|
||||
|
||||
struct cyttsp4_mt_platform_data {
|
||||
struct touch_framework *frmwrk;
|
||||
unsigned short flags;
|
||||
char const *inp_dev_name;
|
||||
};
|
||||
|
||||
struct touch_settings {
|
||||
const uint8_t *data;
|
||||
uint32_t size;
|
||||
uint8_t tag;
|
||||
} __packed;
|
||||
|
||||
struct cyttsp4_core_platform_data {
|
||||
int irq_gpio;
|
||||
int rst_gpio;
|
||||
int level_irq_udelay;
|
||||
int (*xres)(struct cyttsp4_core_platform_data *pdata,
|
||||
struct device *dev);
|
||||
int (*init)(struct cyttsp4_core_platform_data *pdata,
|
||||
int on, struct device *dev);
|
||||
int (*power)(struct cyttsp4_core_platform_data *pdata,
|
||||
int on, struct device *dev, atomic_t *ignore_irq);
|
||||
int (*irq_stat)(struct cyttsp4_core_platform_data *pdata,
|
||||
struct device *dev);
|
||||
struct touch_settings *sett[CY_TOUCH_SETTINGS_MAX];
|
||||
};
|
||||
|
||||
struct cyttsp4_platform_data {
|
||||
struct cyttsp4_core_platform_data *core_pdata;
|
||||
struct cyttsp4_mt_platform_data *mt_pdata;
|
||||
};
|
||||
|
||||
#endif /* _CYTTSP4_H_ */
|
||||
@@ -1,50 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/*
|
||||
* Copyright (C) ST-Ericsson SA 2010
|
||||
*
|
||||
* Author: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
|
||||
*
|
||||
* ux500 Scroll key and Keypad Encoder (SKE) header
|
||||
*/
|
||||
|
||||
#ifndef __SKE_H
|
||||
#define __SKE_H
|
||||
|
||||
#include <linux/input/matrix_keypad.h>
|
||||
|
||||
/* register definitions for SKE peripheral */
|
||||
#define SKE_CR 0x00
|
||||
#define SKE_VAL0 0x04
|
||||
#define SKE_VAL1 0x08
|
||||
#define SKE_DBCR 0x0C
|
||||
#define SKE_IMSC 0x10
|
||||
#define SKE_RIS 0x14
|
||||
#define SKE_MIS 0x18
|
||||
#define SKE_ICR 0x1C
|
||||
|
||||
/*
|
||||
* Keypad module
|
||||
*/
|
||||
|
||||
/**
|
||||
* struct keypad_platform_data - structure for platform specific data
|
||||
* @init: pointer to keypad init function
|
||||
* @exit: pointer to keypad deinitialisation function
|
||||
* @keymap_data: matrix scan code table for keycodes
|
||||
* @krow: maximum number of rows
|
||||
* @kcol: maximum number of columns
|
||||
* @debounce_ms: platform specific debounce time
|
||||
* @no_autorepeat: flag for auto repetition
|
||||
* @wakeup_enable: allow waking up the system
|
||||
*/
|
||||
struct ske_keypad_platform_data {
|
||||
int (*init)(void);
|
||||
int (*exit)(void);
|
||||
const struct matrix_keymap_data *keymap_data;
|
||||
u8 krow;
|
||||
u8 kcol;
|
||||
u8 debounce_ms;
|
||||
bool no_autorepeat;
|
||||
bool wakeup_enable;
|
||||
};
|
||||
#endif /*__SKE_KPD_H*/
|
||||
@@ -1,30 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||
/*
|
||||
* Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd
|
||||
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
|
||||
* Author: HeungJun Kim <riverful.kim@samsung.com>
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MCS_H
|
||||
#define __LINUX_MCS_H
|
||||
|
||||
#define MCS_KEY_MAP(v, c) ((((v) & 0xff) << 16) | ((c) & 0xffff))
|
||||
#define MCS_KEY_VAL(v) (((v) >> 16) & 0xff)
|
||||
#define MCS_KEY_CODE(v) ((v) & 0xffff)
|
||||
|
||||
struct mcs_platform_data {
|
||||
void (*poweron)(bool);
|
||||
void (*cfg_pin)(void);
|
||||
|
||||
/* touchscreen */
|
||||
unsigned int x_size;
|
||||
unsigned int y_size;
|
||||
|
||||
/* touchkey */
|
||||
const u32 *keymap;
|
||||
unsigned int keymap_size;
|
||||
unsigned int key_maxval;
|
||||
bool no_autorepeat;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_MCS_H */
|
||||
@@ -1,15 +0,0 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
/* drivers/input/touchscreen/zforce.c
|
||||
*
|
||||
* Copyright (C) 2012-2013 MundoReader S.L.
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_INPUT_ZFORCE_TS_H
|
||||
#define _LINUX_INPUT_ZFORCE_TS_H
|
||||
|
||||
struct zforce_ts_platdata {
|
||||
unsigned int x_max;
|
||||
unsigned int y_max;
|
||||
};
|
||||
|
||||
#endif /* _LINUX_INPUT_ZFORCE_TS_H */
|
||||
Reference in New Issue
Block a user