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

Commit baf4974e 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: i8042 - print debug data when testing AUX IRQ delivery
  Input: libps2 - fix dependancy on i8042
  Input: fix rx51 board keymap
  Input: ad7879 - pass up error codes from probe functions
  Input: xpad - add BigBen Interactive XBOX 360 Controller
  Input: rotary_encoder - fix relative axis support
  Input: sparkspkr - move remove() functions to .devexit.text
  Input: wistron_btns - add DMI entry for Medion WIM2030 laptop
parents 79a6f564 d3d2dfe2

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

+39 −39
Original line number Diff line number Diff line
@@ -38,49 +38,49 @@ 


static int board_keymap[] = {

	KEY(0, 0, KEY_Q),

	KEY(0, 1, KEY_W),

	KEY(0, 2, KEY_E),

	KEY(0, 3, KEY_R),

	KEY(0, 4, KEY_T),

	KEY(0, 5, KEY_Y),

	KEY(0, 6, KEY_U),

	KEY(0, 7, KEY_I),

	KEY(1, 0, KEY_O),

	KEY(0, 1, KEY_O),

	KEY(0, 2, KEY_P),

	KEY(0, 3, KEY_COMMA),

	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_DOT),

	KEY(1, 3, KEY_V),

	KEY(1, 4, KEY_DOWN),

	KEY(2, 0, KEY_P),

	KEY(2, 1, KEY_F),

	KEY(1, 2, KEY_F),

	KEY(1, 3, KEY_G),

	KEY(1, 4, KEY_H),

	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),

	KEY(2, 3, KEY_B),

	KEY(2, 4, KEY_RIGHT),

	KEY(3, 0, KEY_COMMA),

	KEY(3, 1, KEY_G),

	KEY(3, 2, KEY_ENTER),

	KEY(2, 3, KEY_ENTER),

	KEY(2, 5, KEY_Z),

	KEY(2, 6, KEY_X),

	KEY(2, 7, KEY_C),

	KEY(3, 0, KEY_R),

	KEY(3, 1, KEY_V),

	KEY(3, 2, KEY_B),

	KEY(3, 3, KEY_N),

	KEY(4, 0, KEY_BACKSPACE),

	KEY(4, 1, KEY_H),

	KEY(4, 3, KEY_M),

	KEY(3, 4, KEY_M),

	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(5, 1, KEY_J),

	KEY(5, 2, KEY_Z),

	KEY(5, 3, KEY_SPACE),

	KEY(5, 4, KEY_LEFTSHIFT),

	KEY(6, 0, KEY_A),

	KEY(6, 1, KEY_K),

	KEY(6, 2, KEY_X),

	KEY(6, 3, KEY_SPACE),

	KEY(6, 4, KEY_FN),

	KEY(7, 0, KEY_S),

	KEY(7, 1, KEY_L),

	KEY(7, 2, KEY_C),

	KEY(7, 3, KEY_LEFT),

	KEY(0xff, 0, KEY_F6),

	KEY(0xff, 1, KEY_F7),

	KEY(0xff, 2, KEY_F8),

	KEY(0xff, 4, KEY_F9),

	KEY(0xff, 5, KEY_F10),

	KEY(4, 5, KEY_RIGHTALT),

	KEY(4, 6, KEY_LEFTSHIFT),

	KEY(5, 0, KEY_Y),

	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/xpad.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ static const struct xpad_device { 
	{ 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },

	{ 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },

	{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },

	{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },

	{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0xffff, 0xffff, "Chinese-made Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
@@ -209,6 +210,7 @@ static struct usb_device_id xpad_table [] = { 
	XPAD_XBOX360_VENDOR(0x0738),		/* Mad Catz X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x0e6f),		/* 0x0e6f X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane X-Box 360 controllers */

	XPAD_XBOX360_VENDOR(0x146b),		/* BigBen Interactive Controllers */

	XPAD_XBOX360_VENDOR(0x1bad),		/* Rock Band Drums */

	{ }

};

drivers/input/misc/rotary_encoder.c

+2 −2
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev) 
	struct input_dev *input;

	int err;



	if (!pdata || !pdata->steps) {

		dev_err(&pdev->dev, "invalid platform data\n");

	if (!pdata) {

		dev_err(&pdev->dev, "missing platform data\n");

		return -ENOENT;

	}

drivers/input/misc/sparcspkr.c

+2 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ out_err: 
	return err;

}



static int bbc_remove(struct of_device *op)

static int __devexit bbc_remove(struct of_device *op)

{

	struct sparcspkr_state *state = dev_get_drvdata(&op->dev);

	struct input_dev *input_dev = state->input_dev;
@@ -308,7 +308,7 @@ out_err: 
	return err;

}



static int grover_remove(struct of_device *op)

static int __devexit grover_remove(struct of_device *op)

{

	struct sparcspkr_state *state = dev_get_drvdata(&op->dev);

	struct grover_beep_info *info = &state->u.grover;

drivers/input/misc/wistron_btns.c

+9 −0
Original line number Diff line number Diff line
@@ -934,6 +934,15 @@ static struct dmi_system_id dmi_ids[] __initdata = { 
		},

		.driver_data = keymap_wistron_md2900

	},

	{

		.callback = dmi_matched,

		.ident = "Medion MD 42200",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Medion"),

			DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2030"),

		},

		.driver_data = keymap_fs_amilo_pro_v2000

	},

	{

		.callback = dmi_matched,

		.ident = "Medion MD 96500",