Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov: - a new driver for STM FingerTip touchscreen - a new driver for D-Link DIR-685 touch keys - updated list of supported devices in xpad driver - other assorted updates and fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (23 commits) MAINTAINERS: update input subsystem patterns Input: introduce KEY_ASSISTANT Input: xpad - sync supported devices with XBCD Input: xpad - sync supported devices with 360Controller Input: xen-kbdfront - use string constants from PV protocol Input: stmfts - mark all PM functions as __maybe_unused Input: add support for the STMicroelectronics FingerTip touchscreen Input: add D-Link DIR-685 touchkeys driver Input: s3c2410_ts - handle return value of clk_prepare_enable Input: axp20x-pek - add wakeup support Input: synaptics-rmi4 - use %phN to form F34 configuration ID Input: synaptics-rmi4 - change a char type to u8 Input: sparse-keymap - remove sparse_keymap_free() Input: tsc2007 - move header file out of I2C realm Input: mms114 - move header file out of I2C realm Input: mcs - move header file out of I2C realm Input: lm8323 - move header file out of I2C realm Input: elantech - force relative mode on a certain module Input: elan_i2c - add support for fetching chip type on newer hardware Input: elan_i2c - check if device is there before really probing ...
This commit is contained in:
@@ -1,46 +0,0 @@
|
||||
/*
|
||||
* lm8323.h - Configuration for LM8323 keypad driver.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation (version 2 of the License only).
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_LM8323_H
|
||||
#define __LINUX_LM8323_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/*
|
||||
* Largest keycode that the chip can send, plus one,
|
||||
* so keys can be mapped directly at the index of the
|
||||
* LM8323 keycode instead of subtracting one.
|
||||
*/
|
||||
#define LM8323_KEYMAP_SIZE (0x7f + 1)
|
||||
|
||||
#define LM8323_NUM_PWMS 3
|
||||
|
||||
struct lm8323_platform_data {
|
||||
int debounce_time; /* Time to watch for key bouncing, in ms. */
|
||||
int active_time; /* Idle time until sleep, in ms. */
|
||||
|
||||
int size_x;
|
||||
int size_y;
|
||||
bool repeat;
|
||||
const unsigned short *keymap;
|
||||
|
||||
const char *pwm_names[LM8323_NUM_PWMS];
|
||||
|
||||
const char *name; /* Device name. */
|
||||
};
|
||||
|
||||
#endif /* __LINUX_LM8323_H */
|
@@ -1,35 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd
|
||||
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
|
||||
* Author: HeungJun Kim <riverful.kim@samsung.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
*/
|
||||
|
||||
#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,24 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2012 Samsung Electronics Co.Ltd
|
||||
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundationr
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MMS114_H
|
||||
#define __LINUX_MMS114_H
|
||||
|
||||
struct mms114_platform_data {
|
||||
unsigned int x_size;
|
||||
unsigned int y_size;
|
||||
unsigned int contact_threshold;
|
||||
unsigned int moving_threshold;
|
||||
bool x_invert;
|
||||
bool y_invert;
|
||||
|
||||
void (*cfg_pin)(bool);
|
||||
};
|
||||
|
||||
#endif /* __LINUX_MMS114_H */
|
@@ -1,22 +0,0 @@
|
||||
#ifndef __LINUX_I2C_TSC2007_H
|
||||
#define __LINUX_I2C_TSC2007_H
|
||||
|
||||
/* linux/i2c/tsc2007.h */
|
||||
|
||||
struct tsc2007_platform_data {
|
||||
u16 model; /* 2007. */
|
||||
u16 x_plate_ohms; /* must be non-zero value */
|
||||
u16 max_rt; /* max. resistance above which samples are ignored */
|
||||
unsigned long poll_period; /* time (in ms) between samples */
|
||||
int fuzzx; /* fuzz factor for X, Y and pressure axes */
|
||||
int fuzzy;
|
||||
int fuzzz;
|
||||
|
||||
int (*get_pendown_state)(struct device *);
|
||||
/* If needed, clear 2nd level interrupt source */
|
||||
void (*clear_penirq)(void);
|
||||
int (*init_platform_hw)(void);
|
||||
void (*exit_platform_hw)(void);
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user