Commit 93db6294 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (35 commits)
  Input: add driver for Synaptics I2C touchpad
  Input: synaptics - add support for reporting x/y resolution
  Input: ALPS - handle touchpoints buttons correctly
  Input: gpio-keys - change timer to workqueue
  Input: ads7846 - pin change interrupt support
  Input: add support for touchscreen on W90P910 ARM platform
  Input: appletouch - improve finger detection
  Input: wacom - clear Intuos4 wheel data when finger leaves proximity
  Input: ucb1400 - move static function from header into core
  Input: add driver for EETI touchpanels
  Input: ads7846 - more detailed model name in sysfs
  Input: ads7846 - support swapping x and y axes
  Input: ati_remote2 - use non-atomic bitops
  Input: introduce lm8323 keypad driver
  Input: psmouse - ESD workaround fix for OLPC XO touchpad
  Input: tsc2007 - make sure platform provides get_pendown_state()
  Input: uinput - flush all pending ff effects before destroying device
  Input: simplify name handling for certain input handles
  Input: serio - do not use deprecated dev.power.power_state
  Input: wacom - add support for Intuos4 tablets
  ...
parents 43813f39 eef3e4ca

Documentation/input/input.txt

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ struct input_event { 
};



  'time' is the timestamp, it returns the time at which the event happened.

Type is for example EV_REL for relative moment, REL_KEY for a keypress or

Type is for example EV_REL for relative moment, EV_KEY for a keypress or

release. More types are defined in include/linux/input.h.



  'code' is event code, for example REL_X or KEY_BACKSPACE, again a complete

Documentation/input/rotary-encoder.txt

+8 −1
Original line number Diff line number Diff line
@@ -67,7 +67,12 @@ data with it. 
struct rotary_encoder_platform_data is declared in

include/linux/rotary-encoder.h and needs to be filled with the number of

steps the encoder has and can carry information about externally inverted

signals (because of used invertig buffer or other reasons).

signals (because of an inverting buffer or other reasons). The encoder

can be set up to deliver input information as either an absolute or relative

axes. For relative axes the input event returns +/-1 for each step. For

absolute axes the position of the encoder can either roll over between zero

and the number of steps or will clamp at the maximum and zero depending on

the configuration.



Because GPIO to IRQ mapping is platform specific, this information must

be given in seperately to the driver. See the example below.
@@ -85,6 +90,8 @@ be given in seperately to the driver. See the example below. 
static struct rotary_encoder_platform_data my_rotary_encoder_info = {

	.steps		= 24,

	.axis		= ABS_X,

	.relative_axis	= false,

	.rollover	= false,

	.gpio_a		= GPIO_ROTARY_A,

	.gpio_b		= GPIO_ROTARY_B,

	.inverted_a	= 0,

arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h

 */



#ifndef __ASM_ARCH_EP93XX_KEYPAD_H

#define __ASM_ARCH_EP93XX_KEYPAD_H



#define MAX_MATRIX_KEY_ROWS		(8)

#define MAX_MATRIX_KEY_COLS		(8)



/* flags for the ep93xx_keypad driver */

#define EP93XX_KEYPAD_DISABLE_3_KEY	(1<<0)	/* disable 3-key reset */

#define EP93XX_KEYPAD_DIAG_MODE		(1<<1)	/* diagnostic mode */

#define EP93XX_KEYPAD_BACK_DRIVE	(1<<2)	/* back driving mode */

#define EP93XX_KEYPAD_TEST_MODE		(1<<3)	/* scan only column 0 */

#define EP93XX_KEYPAD_KDIV		(1<<4)	/* 1/4 clock or 1/16 clock */

#define EP93XX_KEYPAD_AUTOREPEAT	(1<<5)	/* enable key autorepeat */



/**

 * struct ep93xx_keypad_platform_data - platform specific device structure

 * @matrix_key_rows:		number of rows in the keypad matrix

 * @matrix_key_cols:		number of columns in the keypad matrix

 * @matrix_key_map:		array of keycodes defining the keypad matrix

 * @matrix_key_map_size:	ARRAY_SIZE(matrix_key_map)

 * @debounce:			debounce start count; terminal count is 0xff

 * @prescale:			row/column counter pre-scaler load value

 * @flags:			see above

 */

struct ep93xx_keypad_platform_data {

	unsigned int	matrix_key_rows;

	unsigned int	matrix_key_cols;

	unsigned int	*matrix_key_map;

	int		matrix_key_map_size;

	unsigned int	debounce;

	unsigned int	prescale;

	unsigned int	flags;

};



/* macro for creating the matrix_key_map table */

#define KEY(row, col, val)	(((row) << 28) | ((col) << 24) | (val))



#endif	/* __ASM_ARCH_EP93XX_KEYPAD_H */

drivers/char/keyboard.c

+0 −2
Original line number Diff line number Diff line
@@ -1123,8 +1123,6 @@ static int emulate_raw(struct vc_data *vc, unsigned int keycode, 


#define HW_RAW(dev)	0



#warning "Cannot generate rawmode keyboard for your architecture yet."



static int emulate_raw(struct vc_data *vc, unsigned int keycode, unsigned char up_flag)

{

	if (keycode > 127)

drivers/input/evdev.c

+13 −8
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ struct evdev { 
	int exist;

	int open;

	int minor;

	char name[16];

	struct input_handle handle;

	wait_queue_head_t wait;

	struct evdev_client *grab;
@@ -609,7 +608,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 
						    p, compat_mode);



			if (_IOC_NR(cmd) == _IOC_NR(EVIOCGNAME(0)))

				return str_to_user(dev->name, _IOC_SIZE(cmd), p);

				return str_to_user(dev_name(&evdev->dev),

						   _IOC_SIZE(cmd), p);



			if (_IOC_NR(cmd) == _IOC_NR(EVIOCGPHYS(0)))

				return str_to_user(dev->phys, _IOC_SIZE(cmd), p);
@@ -626,8 +626,11 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 
				abs.maximum = dev->absmax[t];

				abs.fuzz = dev->absfuzz[t];

				abs.flat = dev->absflat[t];

				abs.resolution = dev->absres[t];



				if (copy_to_user(p, &abs, sizeof(struct input_absinfo)))

				if (copy_to_user(p, &abs, min_t(size_t,

								_IOC_SIZE(cmd),

								sizeof(struct input_absinfo))))

					return -EFAULT;



				return 0;
@@ -654,8 +657,9 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 


				t = _IOC_NR(cmd) & ABS_MAX;



				if (copy_from_user(&abs, p,

						sizeof(struct input_absinfo)))

				if (copy_from_user(&abs, p, min_t(size_t,

								  _IOC_SIZE(cmd),

								  sizeof(struct input_absinfo))))

					return -EFAULT;



				/*
@@ -670,6 +674,8 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 
				dev->absmax[t] = abs.maximum;

				dev->absfuzz[t] = abs.fuzz;

				dev->absflat[t] = abs.flat;

				dev->absres[t] = _IOC_SIZE(cmd) < sizeof(struct input_absinfo) ?

							0 : abs.resolution;



				spin_unlock_irq(&dev->event_lock);
@@ -807,16 +813,15 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev, 
	mutex_init(&evdev->mutex);

	init_waitqueue_head(&evdev->wait);



	snprintf(evdev->name, sizeof(evdev->name), "event%d", minor);

	dev_set_name(&evdev->dev, "event%d", minor);

	evdev->exist = 1;

	evdev->minor = minor;



	evdev->handle.dev = input_get_device(dev);

	evdev->handle.name = evdev->name;

	evdev->handle.name = dev_name(&evdev->dev);

	evdev->handle.handler = handler;

	evdev->handle.private = evdev;



	dev_set_name(&evdev->dev, evdev->name);

	evdev->dev.devt = MKDEV(INPUT_MAJOR, EVDEV_MINOR_BASE + minor);

	evdev->dev.class = &input_class;

	evdev->dev.parent = &dev->dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE