Skip to content

L
linux
Commit 4fd3670e authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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.
parents ea8e1652 4ff891eb
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 33 deletions
drivers/input/gameport/gameport.c
View file @ 4fd3670e
...@@ -38,8 +38,6 @@ EXPORT_SYMBOL(gameport_unregister_driver); ...@@ -38,8 +38,6 @@ EXPORT_SYMBOL(gameport_unregister_driver);
EXPORT_SYMBOL(gameport_open); EXPORT_SYMBOL(gameport_open);
EXPORT_SYMBOL(gameport_close); EXPORT_SYMBOL(gameport_close);
EXPORT_SYMBOL(gameport_rescan); EXPORT_SYMBOL(gameport_rescan);
EXPORT_SYMBOL(gameport_cooked_read);
EXPORT_SYMBOL(gameport_set_name);
EXPORT_SYMBOL(gameport_set_phys); EXPORT_SYMBOL(gameport_set_phys);
EXPORT_SYMBOL(gameport_start_polling); EXPORT_SYMBOL(gameport_start_polling);
EXPORT_SYMBOL(gameport_stop_polling); EXPORT_SYMBOL(gameport_stop_polling);
......
drivers/input/input.c
View file @ 4fd3670e
...@@ -235,6 +235,10 @@ static void input_handle_event(struct input_dev *dev, ...@@ -235,6 +235,10 @@ static void input_handle_event(struct input_dev *dev,
if (value >= 0) if (value >= 0)
disposition = INPUT_PASS_TO_ALL; disposition = INPUT_PASS_TO_ALL;
break; break;
case EV_PWR:
disposition = INPUT_PASS_TO_ALL;
break;
} }
if (type != EV_SYN) if (type != EV_SYN)
...@@ -1266,6 +1270,10 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int ...@@ -1266,6 +1270,10 @@ void input_set_capability(struct input_dev *dev, unsigned int type, unsigned int
__set_bit(code, dev->ffbit); __set_bit(code, dev->ffbit);
break; break;
case EV_PWR:
/* do nothing */
break;
default: default:
printk(KERN_ERR printk(KERN_ERR
"input_set_capability: unknown type %u (code %u)\n", "input_set_capability: unknown type %u (code %u)\n",
......
drivers/input/keyboard/Kconfig
View file @ 4fd3670e
...@@ -209,22 +209,22 @@ config KEYBOARD_HIL ...@@ -209,22 +209,22 @@ config KEYBOARD_HIL
to your machine, so normally you should say Y here. to your machine, so normally you should say Y here.
config KEYBOARD_HP6XX config KEYBOARD_HP6XX
tristate "HP Jornada 6XX Keyboard support" tristate "HP Jornada 6xx keyboard"
depends on SH_HP6XX depends on SH_HP6XX
select INPUT_POLLDEV select INPUT_POLLDEV
help help
This adds support for the onboard keyboard found on Say Y here if you have a HP Jornada 620/660/680/690 and want to
HP Jornada 620/660/680/690. support the built-in keyboard.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called jornada680_kbd. module will be called jornada680_kbd.
config KEYBOARD_HP7XX config KEYBOARD_HP7XX
tristate "HP Jornada 7XX Keyboard Driver" tristate "HP Jornada 7xx keyboard"
depends on SA1100_JORNADA720_SSP && SA1100_SSP depends on SA1100_JORNADA720_SSP && SA1100_SSP
help help
Say Y here to add support for the HP Jornada 7xx (710/720/728) Say Y here if you have a HP Jornada 710/720/728 and want to
onboard keyboard. support the built-in keyboard.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called jornada720_kbd. module will be called jornada720_kbd.
......
drivers/input/keyboard/jornada680_kbd.c
View file @ 4fd3670e
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/input.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/input.h>
#include <linux/input-polldev.h> #include <linux/input-polldev.h>
#include <linux/interrupt.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <asm/delay.h> #include <asm/delay.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -43,22 +43,22 @@ ...@@ -43,22 +43,22 @@
#define PLDR 0xa4000134 #define PLDR 0xa4000134
static const unsigned short jornada_scancodes[] = { static const unsigned short jornada_scancodes[] = {
/* PTD1 */ KEY_CAPSLOCK, KEY_MACRO, KEY_LEFTCTRL, 0, KEY_ESC, 0, 0, 0, /* 1 -> 8 */ /* PTD1 */ KEY_CAPSLOCK, KEY_MACRO, KEY_LEFTCTRL, 0, KEY_ESC, KEY_KP5, 0, 0, /* 1 -> 8 */
KEY_F1, KEY_F2, KEY_F3, KEY_F8, KEY_F7, KEY_F2, KEY_F4, KEY_F5, /* 9 -> 16 */ KEY_F1, KEY_F2, KEY_F3, KEY_F8, KEY_F7, KEY_F6, KEY_F4, KEY_F5, /* 9 -> 16 */
/* PTD5 */ KEY_SLASH, KEY_APOSTROPHE, KEY_ENTER, 0, KEY_Z, 0, 0, 0, /* 17 -> 24 */ /* PTD5 */ KEY_SLASH, KEY_APOSTROPHE, KEY_ENTER, 0, KEY_Z, 0, 0, 0, /* 17 -> 24 */
KEY_X, KEY_C, KEY_V, KEY_DOT, KEY_COMMA, KEY_M, KEY_B, KEY_N, /* 25 -> 32 */ KEY_X, KEY_C, KEY_V, KEY_DOT, KEY_COMMA, KEY_M, KEY_B, KEY_N, /* 25 -> 32 */
/* PTD7 */ KEY_KP2, KEY_KP6, 0, 0, 0, 0, 0, 0, /* 33 -> 40 */ /* PTD7 */ KEY_KP2, KEY_KP6, KEY_KP3, 0, 0, 0, 0, 0, /* 33 -> 40 */
0, 0, 0, KEY_KP4, 0, 0, KEY_LEFTALT, KEY_HANJA, /* 41 -> 48 */ KEY_F10, KEY_RO, KEY_F9, KEY_KP4, KEY_NUMLOCK, KEY_SCROLLLOCK, KEY_LEFTALT, KEY_HANJA, /* 41 -> 48 */
/* PTE0 */ 0, 0, 0, 0, KEY_FINANCE, 0, 0, 0, /* 49 -> 56 */ /* PTE0 */ KEY_KATAKANA, KEY_KP0, KEY_GRAVE, 0, KEY_FINANCE, 0, 0, 0, /* 49 -> 56 */
KEY_LEFTCTRL, 0, KEY_SPACE, KEY_KPDOT, KEY_VOLUMEUP, 249, 0, 0, /* 57 -> 64 */ KEY_KPMINUS, KEY_HIRAGANA, KEY_SPACE, KEY_KPDOT, KEY_VOLUMEUP, 249, 0, 0, /* 57 -> 64 */
/* PTE1 */ KEY_SEMICOLON, KEY_RIGHTBRACE, KEY_BACKSLASH, 0, KEY_A, 0, 0, 0,/* 65 -> 72 */ /* PTE1 */ KEY_SEMICOLON, KEY_RIGHTBRACE, KEY_BACKSLASH, 0, KEY_A, 0, 0, 0, /* 65 -> 72 */
KEY_S, KEY_D, KEY_F, KEY_L, KEY_K, KEY_J, KEY_G, KEY_H, /* 73 -> 80 */ KEY_S, KEY_D, KEY_F, KEY_L, KEY_K, KEY_J, KEY_G, KEY_H, /* 73 -> 80 */
/* PTE3 */ KEY_KP8, KEY_LEFTMETA, KEY_RIGHTSHIFT, 0, KEY_TAB, 0, 0,0, /* 81 -> 88 */ /* PTE3 */ KEY_KP8, KEY_LEFTMETA, KEY_RIGHTSHIFT, 0, KEY_TAB, 0, 0, 0, /* 81 -> 88 */
0, KEY_LEFTSHIFT, 0, 0, 0, 0, 0, 0, /* 89 -> 96 */ 0, KEY_LEFTSHIFT, KEY_KP7, KEY_KP9, KEY_KP1, KEY_F11, KEY_KPPLUS, KEY_KPASTERISK, /* 89 -> 96 */
/* PTE6 */ KEY_P, KEY_LEFTBRACE, KEY_BACKSPACE, 0, KEY_Q, 0, 0, 0, /* 97 -> 104 */ /* PTE6 */ KEY_P, KEY_LEFTBRACE, KEY_BACKSPACE, 0, KEY_Q, 0, 0, 0, /* 97 -> 104 */
KEY_W, KEY_E, KEY_R, KEY_O, KEY_I, KEY_U, KEY_T, KEY_R, /* 105 -> 112 */ KEY_W, KEY_E, KEY_R, KEY_O, KEY_I, KEY_U, KEY_T, KEY_Y, /* 105 -> 112 */
/* PTE7 */ KEY_0, KEY_MINUS, KEY_EQUAL, 0, KEY_1, 0, 0, 0, /* 113 -> 120 */ /* PTE7 */ KEY_0, KEY_MINUS, KEY_EQUAL, 0, KEY_1, 0, 0, 0, /* 113 -> 120 */
KEY_2, KEY_3, KEY_4, KEY_9, KEY_8, KEY_7, KEY_5, KEY_6, /* 121 -> 128 */ KEY_2, KEY_3, KEY_4, KEY_9, KEY_8, KEY_7, KEY_5, KEY_6, /* 121 -> 128 */
/* **** */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* **** */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0 0, 0, 0, 0, 0
}; };
......
drivers/input/keyboard/spitzkbd.c
View file @ 4fd3670e
...@@ -391,6 +391,7 @@ static int __init spitzkbd_probe(struct platform_device *dev) ...@@ -391,6 +391,7 @@ static int __init spitzkbd_probe(struct platform_device *dev)
for (i = 0; i < ARRAY_SIZE(spitzkbd_keycode); i++) for (i = 0; i < ARRAY_SIZE(spitzkbd_keycode); i++)
set_bit(spitzkbd->keycode[i], input_dev->keybit); set_bit(spitzkbd->keycode[i], input_dev->keybit);
clear_bit(0, input_dev->keybit); clear_bit(0, input_dev->keybit);
set_bit(KEY_SUSPEND, input_dev->keybit);
set_bit(SW_LID, input_dev->swbit); set_bit(SW_LID, input_dev->swbit);
set_bit(SW_TABLET_MODE, input_dev->swbit); set_bit(SW_TABLET_MODE, input_dev->swbit);
set_bit(SW_HEADPHONE_INSERT, input_dev->swbit); set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
......
drivers/input/touchscreen/Kconfig
View file @ 4fd3670e
...@@ -115,19 +115,17 @@ config TOUCHSCREEN_MK712 ...@@ -115,19 +115,17 @@ config TOUCHSCREEN_MK712
module will be called mk712. module will be called mk712.
config TOUCHSCREEN_HP600 config TOUCHSCREEN_HP600
tristate "HP Jornada 680/690 touchscreen" tristate "HP Jornada 6xx touchscreen"
depends on SH_HP6XX && SH_ADC depends on SH_HP6XX && SH_ADC
help help
Say Y here if you have a HP Jornada 680 or 690 and want to Say Y here if you have a HP Jornada 620/660/680/690 and want to
support the built-in touchscreen. support the built-in touchscreen.
If unsure, say N.
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called hp680_ts_input. module will be called hp680_ts_input.
config TOUCHSCREEN_HP7XX config TOUCHSCREEN_HP7XX
tristate "HP Jornada 710/720/728 touchscreen" tristate "HP Jornada 7xx touchscreen"
depends on SA1100_JORNADA720_SSP depends on SA1100_JORNADA720_SSP
help help
Say Y here if you have a HP Jornada 710/720/728 and want Say Y here if you have a HP Jornada 710/720/728 and want
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7