Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27efd7e2 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:
  Input: synaptics - relax capability ID checks on newer hardware
  Input: twl40300-keypad - fix handling of "all ground" rows
  Input: gamecon - reference correct pad in gc_psx_command()
  Input: gamecon - reference correct input device in NES mode
  Input: w90p910_keypad - change platfrom driver name to 'nuc900-kpi'
  Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_table
  Input: qt2160 - rename kconfig symbol name
parents 84d4db0e 3619b8fe

arch/arm/mach-omap2/board-rx51-peripherals.c

+14 −3
Original line number Diff line number Diff line
@@ -175,6 +175,10 @@ static void __init rx51_add_gpio_keys(void) 
#endif /* CONFIG_KEYBOARD_GPIO || CONFIG_KEYBOARD_GPIO_MODULE */



static int board_keymap[] = {

	/*

	 * Note that KEY(x, 8, KEY_XXX) entries represent "entrire row

	 * connected to the ground" matrix state.

	 */

	KEY(0, 0, KEY_Q),

	KEY(0, 1, KEY_O),

	KEY(0, 2, KEY_P),
@@ -182,6 +186,7 @@ static int board_keymap[] = { 
	KEY(0, 4, KEY_BACKSPACE),

	KEY(0, 6, KEY_A),

	KEY(0, 7, KEY_S),



	KEY(1, 0, KEY_W),

	KEY(1, 1, KEY_D),

	KEY(1, 2, KEY_F),
@@ -190,6 +195,7 @@ static int board_keymap[] = { 
	KEY(1, 5, KEY_J),

	KEY(1, 6, KEY_K),

	KEY(1, 7, KEY_L),



	KEY(2, 0, KEY_E),

	KEY(2, 1, KEY_DOT),

	KEY(2, 2, KEY_UP),
@@ -197,6 +203,8 @@ static int board_keymap[] = { 
	KEY(2, 5, KEY_Z),

	KEY(2, 6, KEY_X),

	KEY(2, 7, KEY_C),

	KEY(2, 8, KEY_F9),



	KEY(3, 0, KEY_R),

	KEY(3, 1, KEY_V),

	KEY(3, 2, KEY_B),
@@ -205,20 +213,23 @@ static int board_keymap[] = { 
	KEY(3, 5, KEY_SPACE),

	KEY(3, 6, KEY_SPACE),

	KEY(3, 7, KEY_LEFT),



	KEY(4, 0, KEY_T),

	KEY(4, 1, KEY_DOWN),

	KEY(4, 2, KEY_RIGHT),

	KEY(4, 4, KEY_LEFTCTRL),

	KEY(4, 5, KEY_RIGHTALT),

	KEY(4, 6, KEY_LEFTSHIFT),

	KEY(4, 8, KEY_10),



	KEY(5, 0, KEY_Y),

	KEY(5, 8, KEY_11),



	KEY(6, 0, KEY_U),



	KEY(7, 0, KEY_I),

	KEY(7, 1, KEY_F7),

	KEY(7, 2, KEY_F8),

	KEY(0xff, 2, KEY_F9),

	KEY(0xff, 4, KEY_F10),

	KEY(0xff, 5, KEY_F11),

};



static struct matrix_keymap_data board_map_data = {

drivers/input/joystick/gamecon.c

+2 −3
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ struct gc_pad { 
struct gc {

	struct pardevice *pd;

	struct gc_pad pads[GC_MAX_DEVICES];

	struct input_dev *dev[GC_MAX_DEVICES];

	struct timer_list timer;

	int pad_count[GC_MAX];

	int used;
@@ -387,7 +386,7 @@ static void gc_nes_process_packet(struct gc *gc) 
	for (i = 0; i < GC_MAX_DEVICES; i++) {



		pad = &gc->pads[i];

		dev = gc->dev[i];

		dev = pad->dev;

		s = gc_status_bit[i];



		switch (pad->type) {
@@ -579,7 +578,7 @@ static void gc_psx_command(struct gc *gc, int b, unsigned char *data) 
		read = parport_read_status(port) ^ 0x80;



		for (j = 0; j < GC_MAX_DEVICES; j++) {

			struct gc_pad *pad = &gc->pads[i];

			struct gc_pad *pad = &gc->pads[j];



			if (pad->type == GC_PSX || pad->type == GC_DDR)

				data[j] |= (read & gc_status_bit[j]) ? (1 << i) : 0;

drivers/input/keyboard/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ config KEYBOARD_ATKBD_RDI_KEYCODES 
	  right-hand column will be interpreted as the key shown in the

	  left-hand column.



config QT2160

config KEYBOARD_QT2160

	tristate "Atmel AT42QT2160 Touch Sensor Chip"

	depends on I2C && EXPERIMENTAL

	help

drivers/input/keyboard/twl4030_keypad.c

+11 −6
Original line number Diff line number Diff line
@@ -51,8 +51,12 @@ 
 */

#define TWL4030_MAX_ROWS	8	/* TWL4030 hard limit */

#define TWL4030_MAX_COLS	8

#define TWL4030_ROW_SHIFT	3

#define TWL4030_KEYMAP_SIZE	(TWL4030_MAX_ROWS * TWL4030_MAX_COLS)

/*

 * Note that we add space for an extra column so that we can handle

 * row lines connected to the gnd (see twl4030_col_xlate()).

 */

#define TWL4030_ROW_SHIFT	4

#define TWL4030_KEYMAP_SIZE	(TWL4030_MAX_ROWS << TWL4030_ROW_SHIFT)



struct twl4030_keypad {

	unsigned short	keymap[TWL4030_KEYMAP_SIZE];
@@ -182,7 +186,7 @@ static int twl4030_read_kp_matrix_state(struct twl4030_keypad *kp, u16 *state) 
	return ret;

}



static int twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state)

static bool twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state)

{

	int i;

	u16 check = 0;
@@ -191,12 +195,12 @@ static int twl4030_is_in_ghost_state(struct twl4030_keypad *kp, u16 *key_state) 
		u16 col = key_state[i];



		if ((col & check) && hweight16(col) > 1)

			return 1;

			return true;



		check |= col;

	}



	return 0;

	return false;

}



static void twl4030_kp_scan(struct twl4030_keypad *kp, bool release_all)
@@ -225,7 +229,8 @@ static void twl4030_kp_scan(struct twl4030_keypad *kp, bool release_all) 
		if (!changed)

			continue;



		for (col = 0; col < kp->n_cols; col++) {

		/* Extra column handles "all gnd" rows */

		for (col = 0; col < kp->n_cols + 1; col++) {

			int code;



			if (!(changed & (1 << col)))

drivers/input/keyboard/w90p910_keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static struct platform_driver w90p910_keypad_driver = { 
	.probe		= w90p910_keypad_probe,

	.remove		= __devexit_p(w90p910_keypad_remove),

	.driver		= {

		.name	= "nuc900-keypad",

		.name	= "nuc900-kpi",

		.owner	= THIS_MODULE,

	},

};