Commit 6e5565f9 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: (34 commits)
  Input: i8042 - non-x86 build fix
  Input: pxa27x_keypad - also enable on PXA3xx
  Input: pxa27x_keypad - add debounce_interval to the keypad platform data
  Input: pxa27x_keypad - use device resources for I/O memory mapping and IRQ
  Input: pxa27x_keypad - enable rotary encoders and direct keys
  Input: pxa27x_keypad - introduce pxa27x_keypad_config()
  Input: pxa27x_keypad - introduce driver structure and use KEY() to define matrix keys
  Input: pxa27x_keypad - remove pin configuration from the driver
  Input: pxa27x_keypad - rename the driver (was pxa27x_keyboard)
  Input: constify function pointer tables (seq_operations)
  Input: i8042 - add Fujitsu-Siemens Amilo Pro 2010 to nomux list
  Input: i8042 - enable DMI quirks on x86-64
  Input: i8042 - add Dritek quirk for Acer Aspire 9110
  Input: add input event to APM event bridge
  Input: mousedev - use BIT_MASK instead of BIT
  Input: remove duplicate includes
  Input: remove cdev from input_dev structure
  Input: remove duplicated headers in drivers/char/keyboard.c
  Input: i8042 - add Dritek keyboard extension quirk
  Input: add Tosa keyboard driver
  ...
parents e5a9e8e6 03366e7b

Documentation/input/input-programming.txt

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static struct input_dev *button_dev; 


static void button_interrupt(int irq, void *dummy, struct pt_regs *fp)

{

	input_report_key(button_dev, BTN_1, inb(BUTTON_PORT) & 1);

	input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1);

	input_sync(button_dev);

}

arch/arm/mach-pxa/tosa.c

+43 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <linux/mmc/host.h>

#include <linux/pm.h>

#include <linux/delay.h>

#include <linux/gpio_keys.h>

#include <linux/input.h>



#include <asm/setup.h>

#include <asm/memory.h>
@@ -246,6 +248,46 @@ static struct platform_device tosakbd_device = { 
	.id		= -1,

};



static struct gpio_keys_button tosa_gpio_keys[] = {

	{

		.type	= EV_PWR,

		.code	= KEY_SUSPEND,

		.gpio	= TOSA_GPIO_ON_KEY,

		.desc	= "On key",

		.wakeup	= 1,

		.active_low = 1,

	},

	{

		.type	= EV_KEY,

		.code	= TOSA_KEY_RECORD,

		.gpio	= TOSA_GPIO_RECORD_BTN,

		.desc	= "Record Button",

		.wakeup	= 1,

		.active_low = 1,

	},

	{

		.type	= EV_KEY,

		.code	= TOSA_KEY_SYNC,

		.gpio	= TOSA_GPIO_SYNC,

		.desc	= "Sync Button",

		.wakeup	= 1,

		.active_low = 1,

	},

};



static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = {

	.buttons	= tosa_gpio_keys,

	.nbuttons	= ARRAY_SIZE(tosa_gpio_keys),

};



static struct platform_device tosa_gpio_keys_device = {

	.name	= "gpio-keys",

	.id	= -1,

	.dev	= {

		.platform_data	= &tosa_gpio_keys_platform_data,

	},

};



/*

 * Tosa LEDs

 */
@@ -258,6 +300,7 @@ static struct platform_device *devices[] __initdata = { 
	&tosascoop_device,

	&tosascoop_jc_device,

	&tosakbd_device,

	&tosa_gpio_keys_device,

	&tosaled_device,

};

drivers/char/keyboard.c

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/kbd_kern.h>

#include <linux/kbd_diacr.h>

#include <linux/vt_kern.h>

#include <linux/consolemap.h>

#include <linux/sysrq.h>

#include <linux/input.h>

#include <linux/reboot.h>
@@ -194,7 +193,7 @@ int getkeycode(unsigned int scancode) 
	int error = -ENODEV;



	list_for_each_entry(handle, &kbd_handler.h_list, h_node) {

		error = handle->dev->getkeycode(handle->dev, scancode, &keycode);

		error = input_get_keycode(handle->dev, scancode, &keycode);

		if (!error)

			return keycode;

	}
@@ -208,7 +207,7 @@ int setkeycode(unsigned int scancode, unsigned int keycode) 
	int error = -ENODEV;



	list_for_each_entry(handle, &kbd_handler.h_list, h_node) {

		error = handle->dev->setkeycode(handle->dev, scancode, keycode);

		error = input_set_keycode(handle->dev, scancode, keycode);

		if (!error)

			break;

	}

drivers/input/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -137,6 +137,18 @@ config INPUT_EVBUG 
	  To compile this driver as a module, choose M here: the

	  module will be called evbug.



config INPUT_APMPOWER

	tristate "Input Power Event -> APM Bridge" if EMBEDDED

	depends on INPUT && APM_EMULATION

	---help---

	  Say Y here if you want suspend key events to trigger a user

	  requested suspend through APM. This is useful on embedded

	  systems where such behviour is desired without userspace

	  interaction. If unsure, say N.



	  To compile this driver as a module, choose M here: the

	  module will be called apm-power.



comment "Input Device Drivers"



source "drivers/input/keyboard/Kconfig"

drivers/input/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ obj-$(CONFIG_INPUT_TABLET) += tablet/ 
obj-$(CONFIG_INPUT_TOUCHSCREEN)	+= touchscreen/

obj-$(CONFIG_INPUT_MISC)	+= misc/



obj-$(CONFIG_INPUT_APMPOWER)	+= apm-power.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE