Commit a952baa0 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: (64 commits)
  Input: tsc2005 - remove 'disable' sysfs attribute
  Input: tsc2005 - add open/close
  Input: tsc2005 - handle read errors from SPI layer
  Input: tsc2005 - do not rearm timer in hardirq handler
  Input: tsc2005 - don't use work for 'pen up' handling
  Input: tsc2005 - do not use 0 in place of NULL
  Input: tsc2005 - use true/false for boolean variables
  Input: tsc2005 - hide selftest attribute if we can't reset
  Input: tsc2005 - rework driver initialization code
  Input: tsc2005 - set up bus type in input device
  Input: tsc2005 - set up parent device
  Input: tsc2005 - clear driver data after unbinding
  Input: tsc2005 - add module description
  Input: tsc2005 - remove driver banner message
  Input: tsc2005 - remove incorrect module alias
  Input: tsc2005 - convert to using dev_pm_ops
  Input: tsc2005 - use spi_get/set_drvdata()
  Input: introduce tsc2005 driver
  Input: xen-kbdfront - move to drivers/input/misc
  Input: xen-kbdfront - add grant reference for shared page
  ...
parents 5bab188a 97eb3f24

arch/arm/mach-s5pv210/mach-goni.c

+5 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/fb.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>

#include <linux/i2c/qt602240_ts.h>

#include <linux/i2c/atmel_mxt_ts.h>

#include <linux/mfd/max8998.h>

#include <linux/mfd/wm8994/pdata.h>

#include <linux/regulator/fixed.h>
@@ -25,6 +25,7 @@ 
#include <linux/gpio_keys.h>

#include <linux/input.h>

#include <linux/gpio.h>

#include <linux/interrupt.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -225,7 +226,7 @@ static void __init goni_radio_init(void) 
}



/* TSP */

static struct qt602240_platform_data qt602240_platform_data = {

static struct mxt_platform_data qt602240_platform_data = {

	.x_line		= 17,

	.y_line		= 11,

	.x_size		= 800,
@@ -233,7 +234,8 @@ static struct qt602240_platform_data qt602240_platform_data = { 
	.blen		= 0x21,

	.threshold	= 0x28,

	.voltage	= 2800000,              /* 2.8V */

	.orient		= QT602240_DIAGONAL,

	.orient		= MXT_DIAGONAL,

	.irqflags	= IRQF_TRIGGER_FALLING,

};



static struct s3c2410_platform_i2c i2c2_data __initdata = {

drivers/hid/hid-apple.c

+6 −0
Original line number Diff line number Diff line
@@ -481,6 +481,12 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

drivers/hid/hid-core.c

+6 −0
Original line number Diff line number Diff line
@@ -1333,6 +1333,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
@@ -1840,6 +1843,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },

	{ }

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ 
#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI	0x0242

#define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO	0x0243

#define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS	0x0244

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI	0x0245

#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO	0x0246

#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS	0x0247

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b

drivers/hid/hid-input.c

+2 −2
Original line number Diff line number Diff line
@@ -900,8 +900,8 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) 
					hid->ll_driver->hidinput_input_event;

				input_dev->open = hidinput_open;

				input_dev->close = hidinput_close;

				input_dev->setkeycode_new = hidinput_setkeycode;

				input_dev->getkeycode_new = hidinput_getkeycode;

				input_dev->setkeycode = hidinput_setkeycode;

				input_dev->getkeycode = hidinput_getkeycode;



				input_dev->name = hid->name;

				input_dev->phys = hid->phys;

CRA Git | Maintained and supported by SUSTech CRA and CCSE