Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
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: improve Kconfig help entries for HP Jornada devices
Input: pass EV_PWR events to event handlers
Input: spitzkbd - fix suspend key handling
gameport: don't export functions that are static inline
Input: jornada680_kbd - fix default keymap
Input: Handle EV_PWR type of input caps in input_set_capability.
-2
drivers/input/gameport/gameport.c
-2
drivers/input/gameport/gameport.c
···
38
EXPORT_SYMBOL(gameport_open);
39
EXPORT_SYMBOL(gameport_close);
40
EXPORT_SYMBOL(gameport_rescan);
41
-
EXPORT_SYMBOL(gameport_cooked_read);
42
-
EXPORT_SYMBOL(gameport_set_name);
43
EXPORT_SYMBOL(gameport_set_phys);
44
EXPORT_SYMBOL(gameport_start_polling);
45
EXPORT_SYMBOL(gameport_stop_polling);
+8
drivers/input/input.c
+8
drivers/input/input.c
···
235
if (value >= 0)
236
disposition = INPUT_PASS_TO_ALL;
237
break;
238
+
239
+
case EV_PWR:
240
+
disposition = INPUT_PASS_TO_ALL;
241
+
break;
242
}
243
244
if (type != EV_SYN)
···
1264
1265
case EV_FF:
1266
__set_bit(code, dev->ffbit);
1267
+
break;
1268
+
1269
+
case EV_PWR:
1270
+
/* do nothing */
1271
break;
1272
1273
default:
+6
-6
drivers/input/keyboard/Kconfig
+6
-6
drivers/input/keyboard/Kconfig
···
209
to your machine, so normally you should say Y here.
210
211
config KEYBOARD_HP6XX
212
-
tristate "HP Jornada 6XX Keyboard support"
213
depends on SH_HP6XX
214
select INPUT_POLLDEV
215
help
216
-
This adds support for the onboard keyboard found on
217
-
HP Jornada 620/660/680/690.
218
219
To compile this driver as a module, choose M here: the
220
module will be called jornada680_kbd.
221
222
config KEYBOARD_HP7XX
223
-
tristate "HP Jornada 7XX Keyboard Driver"
224
depends on SA1100_JORNADA720_SSP && SA1100_SSP
225
help
226
-
Say Y here to add support for the HP Jornada 7xx (710/720/728)
227
-
onboard keyboard.
228
229
To compile this driver as a module, choose M here: the
230
module will be called jornada720_kbd.
···
209
to your machine, so normally you should say Y here.
210
211
config KEYBOARD_HP6XX
212
+
tristate "HP Jornada 6xx keyboard"
213
depends on SH_HP6XX
214
select INPUT_POLLDEV
215
help
216
+
Say Y here if you have a HP Jornada 620/660/680/690 and want to
217
+
support the built-in keyboard.
218
219
To compile this driver as a module, choose M here: the
220
module will be called jornada680_kbd.
221
222
config KEYBOARD_HP7XX
223
+
tristate "HP Jornada 7xx keyboard"
224
depends on SA1100_JORNADA720_SSP && SA1100_SSP
225
help
226
+
Say Y here if you have a HP Jornada 710/720/728 and want to
227
+
support the built-in keyboard.
228
229
To compile this driver as a module, choose M here: the
230
module will be called jornada720_kbd.
+20
-20
drivers/input/keyboard/jornada680_kbd.c
+20
-20
drivers/input/keyboard/jornada680_kbd.c
···
16
* published by the Free Software Foundation.
17
*/
18
19
#include <linux/input.h>
20
#include <linux/kernel.h>
21
#include <linux/module.h>
22
-
#include <linux/init.h>
23
-
#include <linux/input-polldev.h>
24
-
#include <linux/jiffies.h>
25
#include <linux/platform_device.h>
26
-
#include <linux/interrupt.h>
27
28
#include <asm/delay.h>
29
#include <asm/io.h>
···
43
#define PLDR 0xa4000134
44
45
static const unsigned short jornada_scancodes[] = {
46
-
/* PTD1 */ KEY_CAPSLOCK, KEY_MACRO, KEY_LEFTCTRL, 0, KEY_ESC, 0, 0, 0, /* 1 -> 8 */
47
-
KEY_F1, KEY_F2, KEY_F3, KEY_F8, KEY_F7, KEY_F2, KEY_F4, KEY_F5, /* 9 -> 16 */
48
-
/* PTD5 */ KEY_SLASH, KEY_APOSTROPHE, KEY_ENTER, 0, KEY_Z, 0, 0, 0, /* 17 -> 24 */
49
-
KEY_X, KEY_C, KEY_V, KEY_DOT, KEY_COMMA, KEY_M, KEY_B, KEY_N, /* 25 -> 32 */
50
-
/* PTD7 */ KEY_KP2, KEY_KP6, 0, 0, 0, 0, 0, 0, /* 33 -> 40 */
51
-
0, 0, 0, KEY_KP4, 0, 0, KEY_LEFTALT, KEY_HANJA, /* 41 -> 48 */
52
-
/* PTE0 */ 0, 0, 0, 0, KEY_FINANCE, 0, 0, 0, /* 49 -> 56 */
53
-
KEY_LEFTCTRL, 0, KEY_SPACE, KEY_KPDOT, KEY_VOLUMEUP, 249, 0, 0, /* 57 -> 64 */
54
-
/* PTE1 */ KEY_SEMICOLON, KEY_RIGHTBRACE, KEY_BACKSLASH, 0, KEY_A, 0, 0, 0,/* 65 -> 72 */
55
-
KEY_S, KEY_D, KEY_F, KEY_L, KEY_K, KEY_J, KEY_G, KEY_H, /* 73 -> 80 */
56
-
/* PTE3 */ KEY_KP8, KEY_LEFTMETA, KEY_RIGHTSHIFT, 0, KEY_TAB, 0, 0,0, /* 81 -> 88 */
57
-
0, KEY_LEFTSHIFT, 0, 0, 0, 0, 0, 0, /* 89 -> 96 */
58
-
/* PTE6 */ KEY_P, KEY_LEFTBRACE, KEY_BACKSPACE, 0, KEY_Q, 0, 0, 0, /* 97 -> 104 */
59
-
KEY_W, KEY_E, KEY_R, KEY_O, KEY_I, KEY_U, KEY_T, KEY_R, /* 105 -> 112 */
60
-
/* PTE7 */ KEY_0, KEY_MINUS, KEY_EQUAL, 0, KEY_1, 0, 0, 0, /* 113 -> 120 */
61
-
KEY_2, KEY_3, KEY_4, KEY_9, KEY_8, KEY_7, KEY_5, KEY_6, /* 121 -> 128 */
62
/* **** */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
63
0, 0, 0, 0, 0
64
};
···
16
* published by the Free Software Foundation.
17
*/
18
19
+
#include <linux/init.h>
20
#include <linux/input.h>
21
+
#include <linux/input-polldev.h>
22
+
#include <linux/interrupt.h>
23
+
#include <linux/jiffies.h>
24
#include <linux/kernel.h>
25
#include <linux/module.h>
26
#include <linux/platform_device.h>
27
28
#include <asm/delay.h>
29
#include <asm/io.h>
···
43
#define PLDR 0xa4000134
44
45
static const unsigned short jornada_scancodes[] = {
46
+
/* PTD1 */ KEY_CAPSLOCK, KEY_MACRO, KEY_LEFTCTRL, 0, KEY_ESC, KEY_KP5, 0, 0, /* 1 -> 8 */
47
+
KEY_F1, KEY_F2, KEY_F3, KEY_F8, KEY_F7, KEY_F6, KEY_F4, KEY_F5, /* 9 -> 16 */
48
+
/* PTD5 */ KEY_SLASH, KEY_APOSTROPHE, KEY_ENTER, 0, KEY_Z, 0, 0, 0, /* 17 -> 24 */
49
+
KEY_X, KEY_C, KEY_V, KEY_DOT, KEY_COMMA, KEY_M, KEY_B, KEY_N, /* 25 -> 32 */
50
+
/* PTD7 */ KEY_KP2, KEY_KP6, KEY_KP3, 0, 0, 0, 0, 0, /* 33 -> 40 */
51
+
KEY_F10, KEY_RO, KEY_F9, KEY_KP4, KEY_NUMLOCK, KEY_SCROLLLOCK, KEY_LEFTALT, KEY_HANJA, /* 41 -> 48 */
52
+
/* PTE0 */ KEY_KATAKANA, KEY_KP0, KEY_GRAVE, 0, KEY_FINANCE, 0, 0, 0, /* 49 -> 56 */
53
+
KEY_KPMINUS, KEY_HIRAGANA, KEY_SPACE, KEY_KPDOT, KEY_VOLUMEUP, 249, 0, 0, /* 57 -> 64 */
54
+
/* PTE1 */ KEY_SEMICOLON, KEY_RIGHTBRACE, KEY_BACKSLASH, 0, KEY_A, 0, 0, 0, /* 65 -> 72 */
55
+
KEY_S, KEY_D, KEY_F, KEY_L, KEY_K, KEY_J, KEY_G, KEY_H, /* 73 -> 80 */
56
+
/* PTE3 */ KEY_KP8, KEY_LEFTMETA, KEY_RIGHTSHIFT, 0, KEY_TAB, 0, 0, 0, /* 81 -> 88 */
57
+
0, KEY_LEFTSHIFT, KEY_KP7, KEY_KP9, KEY_KP1, KEY_F11, KEY_KPPLUS, KEY_KPASTERISK, /* 89 -> 96 */
58
+
/* PTE6 */ KEY_P, KEY_LEFTBRACE, KEY_BACKSPACE, 0, KEY_Q, 0, 0, 0, /* 97 -> 104 */
59
+
KEY_W, KEY_E, KEY_R, KEY_O, KEY_I, KEY_U, KEY_T, KEY_Y, /* 105 -> 112 */
60
+
/* PTE7 */ KEY_0, KEY_MINUS, KEY_EQUAL, 0, KEY_1, 0, 0, 0, /* 113 -> 120 */
61
+
KEY_2, KEY_3, KEY_4, KEY_9, KEY_8, KEY_7, KEY_5, KEY_6, /* 121 -> 128 */
62
/* **** */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
63
0, 0, 0, 0, 0
64
};
+1
drivers/input/keyboard/spitzkbd.c
+1
drivers/input/keyboard/spitzkbd.c
···
391
for (i = 0; i < ARRAY_SIZE(spitzkbd_keycode); i++)
392
set_bit(spitzkbd->keycode[i], input_dev->keybit);
393
clear_bit(0, input_dev->keybit);
394
+
set_bit(KEY_SUSPEND, input_dev->keybit);
395
set_bit(SW_LID, input_dev->swbit);
396
set_bit(SW_TABLET_MODE, input_dev->swbit);
397
set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
+3
-5
drivers/input/touchscreen/Kconfig
+3
-5
drivers/input/touchscreen/Kconfig
···
115
module will be called mk712.
116
117
config TOUCHSCREEN_HP600
118
-
tristate "HP Jornada 680/690 touchscreen"
119
depends on SH_HP6XX && SH_ADC
120
help
121
-
Say Y here if you have a HP Jornada 680 or 690 and want to
122
support the built-in touchscreen.
123
-
124
-
If unsure, say N.
125
126
To compile this driver as a module, choose M here: the
127
module will be called hp680_ts_input.
128
129
config TOUCHSCREEN_HP7XX
130
-
tristate "HP Jornada 710/720/728 touchscreen"
131
depends on SA1100_JORNADA720_SSP
132
help
133
Say Y here if you have a HP Jornada 710/720/728 and want
···
115
module will be called mk712.
116
117
config TOUCHSCREEN_HP600
118
+
tristate "HP Jornada 6xx touchscreen"
119
depends on SH_HP6XX && SH_ADC
120
help
121
+
Say Y here if you have a HP Jornada 620/660/680/690 and want to
122
support the built-in touchscreen.
123
124
To compile this driver as a module, choose M here: the
125
module will be called hp680_ts_input.
126
127
config TOUCHSCREEN_HP7XX
128
+
tristate "HP Jornada 7xx touchscreen"
129
depends on SA1100_JORNADA720_SSP
130
help
131
Say Y here if you have a HP Jornada 710/720/728 and want