Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+69
-54
+39
-39
arch/arm/mach-omap2/board-rx51-peripherals.c
+39
-39
arch/arm/mach-omap2/board-rx51-peripherals.c
···
38
38
39
39
static int board_keymap[] = {
40
40
KEY(0, 0, KEY_Q),
41
-
KEY(0, 1, KEY_W),
42
-
KEY(0, 2, KEY_E),
43
-
KEY(0, 3, KEY_R),
44
-
KEY(0, 4, KEY_T),
45
-
KEY(0, 5, KEY_Y),
46
-
KEY(0, 6, KEY_U),
47
-
KEY(0, 7, KEY_I),
48
-
KEY(1, 0, KEY_O),
41
+
KEY(0, 1, KEY_O),
42
+
KEY(0, 2, KEY_P),
43
+
KEY(0, 3, KEY_COMMA),
44
+
KEY(0, 4, KEY_BACKSPACE),
45
+
KEY(0, 6, KEY_A),
46
+
KEY(0, 7, KEY_S),
47
+
KEY(1, 0, KEY_W),
49
48
KEY(1, 1, KEY_D),
50
-
KEY(1, 2, KEY_DOT),
51
-
KEY(1, 3, KEY_V),
52
-
KEY(1, 4, KEY_DOWN),
53
-
KEY(2, 0, KEY_P),
54
-
KEY(2, 1, KEY_F),
49
+
KEY(1, 2, KEY_F),
50
+
KEY(1, 3, KEY_G),
51
+
KEY(1, 4, KEY_H),
52
+
KEY(1, 5, KEY_J),
53
+
KEY(1, 6, KEY_K),
54
+
KEY(1, 7, KEY_L),
55
+
KEY(2, 0, KEY_E),
56
+
KEY(2, 1, KEY_DOT),
55
57
KEY(2, 2, KEY_UP),
56
-
KEY(2, 3, KEY_B),
57
-
KEY(2, 4, KEY_RIGHT),
58
-
KEY(3, 0, KEY_COMMA),
59
-
KEY(3, 1, KEY_G),
60
-
KEY(3, 2, KEY_ENTER),
58
+
KEY(2, 3, KEY_ENTER),
59
+
KEY(2, 5, KEY_Z),
60
+
KEY(2, 6, KEY_X),
61
+
KEY(2, 7, KEY_C),
62
+
KEY(3, 0, KEY_R),
63
+
KEY(3, 1, KEY_V),
64
+
KEY(3, 2, KEY_B),
61
65
KEY(3, 3, KEY_N),
62
-
KEY(4, 0, KEY_BACKSPACE),
63
-
KEY(4, 1, KEY_H),
64
-
KEY(4, 3, KEY_M),
66
+
KEY(3, 4, KEY_M),
67
+
KEY(3, 5, KEY_SPACE),
68
+
KEY(3, 6, KEY_SPACE),
69
+
KEY(3, 7, KEY_LEFT),
70
+
KEY(4, 0, KEY_T),
71
+
KEY(4, 1, KEY_DOWN),
72
+
KEY(4, 2, KEY_RIGHT),
65
73
KEY(4, 4, KEY_LEFTCTRL),
66
-
KEY(5, 1, KEY_J),
67
-
KEY(5, 2, KEY_Z),
68
-
KEY(5, 3, KEY_SPACE),
69
-
KEY(5, 4, KEY_LEFTSHIFT),
70
-
KEY(6, 0, KEY_A),
71
-
KEY(6, 1, KEY_K),
72
-
KEY(6, 2, KEY_X),
73
-
KEY(6, 3, KEY_SPACE),
74
-
KEY(6, 4, KEY_FN),
75
-
KEY(7, 0, KEY_S),
76
-
KEY(7, 1, KEY_L),
77
-
KEY(7, 2, KEY_C),
78
-
KEY(7, 3, KEY_LEFT),
79
-
KEY(0xff, 0, KEY_F6),
80
-
KEY(0xff, 1, KEY_F7),
81
-
KEY(0xff, 2, KEY_F8),
82
-
KEY(0xff, 4, KEY_F9),
83
-
KEY(0xff, 5, KEY_F10),
74
+
KEY(4, 5, KEY_RIGHTALT),
75
+
KEY(4, 6, KEY_LEFTSHIFT),
76
+
KEY(5, 0, KEY_Y),
77
+
KEY(6, 0, KEY_U),
78
+
KEY(7, 0, KEY_I),
79
+
KEY(7, 1, KEY_F7),
80
+
KEY(7, 2, KEY_F8),
81
+
KEY(0xff, 2, KEY_F9),
82
+
KEY(0xff, 4, KEY_F10),
83
+
KEY(0xff, 5, KEY_F11),
84
84
};
85
85
86
86
static struct matrix_keymap_data board_map_data = {
+2
drivers/input/joystick/xpad.c
+2
drivers/input/joystick/xpad.c
···
143
143
{ 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
144
144
{ 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
145
145
{ 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
146
+
{ 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
146
147
{ 0x045e, 0x028e, "Microsoft X-Box 360 pad", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
147
148
{ 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
148
149
{ 0xffff, 0xffff, "Chinese-made Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
···
210
209
XPAD_XBOX360_VENDOR(0x0738), /* Mad Catz X-Box 360 controllers */
211
210
XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */
212
211
XPAD_XBOX360_VENDOR(0x1430), /* RedOctane X-Box 360 controllers */
212
+
XPAD_XBOX360_VENDOR(0x146b), /* BigBen Interactive Controllers */
213
213
XPAD_XBOX360_VENDOR(0x1bad), /* Rock Band Drums */
214
214
{ }
215
215
};
+2
-2
drivers/input/misc/rotary_encoder.c
+2
-2
drivers/input/misc/rotary_encoder.c
+2
-2
drivers/input/misc/sparcspkr.c
+2
-2
drivers/input/misc/sparcspkr.c
···
230
230
return err;
231
231
}
232
232
233
-
static int bbc_remove(struct of_device *op)
233
+
static int __devexit bbc_remove(struct of_device *op)
234
234
{
235
235
struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
236
236
struct input_dev *input_dev = state->input_dev;
···
308
308
return err;
309
309
}
310
310
311
-
static int grover_remove(struct of_device *op)
311
+
static int __devexit grover_remove(struct of_device *op)
312
312
{
313
313
struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
314
314
struct grover_beep_info *info = &state->u.grover;
+9
drivers/input/misc/wistron_btns.c
+9
drivers/input/misc/wistron_btns.c
···
936
936
},
937
937
{
938
938
.callback = dmi_matched,
939
+
.ident = "Medion MD 42200",
940
+
.matches = {
941
+
DMI_MATCH(DMI_SYS_VENDOR, "Medion"),
942
+
DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2030"),
943
+
},
944
+
.driver_data = keymap_fs_amilo_pro_v2000
945
+
},
946
+
{
947
+
.callback = dmi_matched,
939
948
.ident = "Medion MD 96500",
940
949
.matches = {
941
950
DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
+7
-6
drivers/input/serio/Kconfig
+7
-6
drivers/input/serio/Kconfig
···
4
4
config SERIO
5
5
tristate "Serial I/O support" if EMBEDDED || !X86
6
6
default y
7
-
---help---
7
+
help
8
8
Say Yes here if you have any input device that uses serial I/O to
9
9
communicate with the system. This includes the
10
10
* standard AT keyboard and PS/2 mouse *
···
22
22
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
23
23
default y
24
24
depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
25
-
---help---
25
+
help
26
26
i8042 is the chip over which the standard AT keyboard and PS/2
27
27
mouse are connected to the computer. If you use these devices,
28
28
you'll need to say Y here.
···
35
35
config SERIO_SERPORT
36
36
tristate "Serial port line discipline"
37
37
default y
38
-
---help---
38
+
help
39
39
Say Y here if you plan to use an input device (mouse, joystick,
40
40
tablet, 6dof) that communicates over the RS232 serial (COM) port.
41
41
···
49
49
config SERIO_CT82C710
50
50
tristate "ct82c710 Aux port controller"
51
51
depends on X86
52
-
---help---
52
+
help
53
53
Say Y here if you have a Texas Instruments TravelMate notebook
54
54
equipped with the ct82c710 chip and want to use a mouse connected
55
55
to the "QuickPort".
···
66
66
config SERIO_PARKBD
67
67
tristate "Parallel port keyboard adapter"
68
68
depends on PARPORT
69
-
---help---
69
+
help
70
70
Say Y here if you built a simple parallel port adapter to attach
71
71
an additional AT keyboard, XT keyboard or PS/2 mouse.
72
72
···
124
124
tristate "HP System Device Controller i8042 Support"
125
125
depends on (GSC || HP300) && SERIO
126
126
default y
127
-
---help---
127
+
help
128
128
This option enables support for the "System Device
129
129
Controller", an i8042 carrying microcode to manage a
130
130
few miscellaneous devices on some Hewlett Packard systems.
···
168
168
169
169
config SERIO_LIBPS2
170
170
tristate "PS/2 driver library" if EMBEDDED
171
+
depends on SERIO_I8042 || SERIO_I8042=n
171
172
help
172
173
Say Y here if you are using a driver for device connected
173
174
to a PS/2 port, such as PS/2 mouse or standard AT keyboard.
+3
drivers/input/serio/i8042.c
+3
drivers/input/serio/i8042.c
···
609
609
str = i8042_read_status();
610
610
if (str & I8042_STR_OBF) {
611
611
data = i8042_read_data();
612
+
dbg("%02x <- i8042 (aux_test_irq, %s)",
613
+
data, str & I8042_STR_AUXDATA ? "aux" : "kbd");
612
614
if (i8042_irq_being_tested &&
613
615
data == 0xa5 && (str & I8042_STR_AUXDATA))
614
616
complete(&i8042_aux_irq_delivered);
···
752
750
* AUX IRQ was never delivered so we need to flush the controller to
753
751
* get rid of the byte we put there; otherwise keyboard may not work.
754
752
*/
753
+
dbg(" -- i8042 (aux irq test timeout)");
755
754
i8042_flush();
756
755
retval = -1;
757
756
}
+2
-2
drivers/input/touchscreen/ad7879.c
+2
-2
drivers/input/touchscreen/ad7879.c
···
645
645
kfree(ts);
646
646
}
647
647
648
-
return 0;
648
+
return error;
649
649
}
650
650
651
651
static int __devexit ad7879_remove(struct spi_device *spi)
···
732
732
kfree(ts);
733
733
}
734
734
735
-
return 0;
735
+
return error;
736
736
}
737
737
738
738
static int __devexit ad7879_remove(struct i2c_client *client)
+3
-3
include/linux/i2c/twl4030.h
+3
-3
include/linux/i2c/twl4030.h
···
349
349
int irq_line;
350
350
};
351
351
352
-
/* Boards have uniqe mappings of {col, row} --> keycode.
353
-
* Column and row are 4 bits, but range only from 0..7.
352
+
/* Boards have uniqe mappings of {row, col} --> keycode.
353
+
* Column and row are 8 bits each, but range only from 0..7.
354
354
* a PERSISTENT_KEY is "always on" and never reported.
355
355
*/
356
-
#define PERSISTENT_KEY(c, r) KEY((c), (r), KEY_RESERVED)
356
+
#define PERSISTENT_KEY(r, c) KEY((r), (c), KEY_RESERVED)
357
357
358
358
struct twl4030_keypad_data {
359
359
const struct matrix_keymap_data *keymap_data;