Merge branches 'upstream' and 'upstream-fixes' into for-linus (c3d9d743) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/hid/Kconfig

+30 −30

Original line number	Original line	Diff line number	Diff line
	@@ -56,20 +56,20 @@ menu "Special HID drivers"
	depends on HID		depends on HID

	config HID_3M_PCT		config HID_3M_PCT
	tristate "3M PCT"		tristate "3M PCT touchscreen"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for 3M PCT touch screens.		Support for 3M PCT touch screens.

	config HID_A4TECH		config HID_A4TECH
	tristate "A4 tech" if EMBEDDED		tristate "A4 tech mice" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for A4 tech X5 and WOP-35 / Trust 450L mice.		Support for A4 tech X5 and WOP-35 / Trust 450L mice.

	config HID_ACRUX_FF		config HID_ACRUX_FF
	tristate "ACRUX force feedback support"		tristate "ACRUX force feedback"
	depends on USB_HID		depends on USB_HID
	select INPUT_FF_MEMLESS		select INPUT_FF_MEMLESS
	---help---		---help---
	@@ -77,7 +77,7 @@ config HID_ACRUX_FF
	game controllers.		game controllers.

	config HID_APPLE		config HID_APPLE
	tristate "Apple" if EMBEDDED		tristate "Apple {i,Power,Mac}Books" if EMBEDDED
	depends on (USB_HID \|\| BT_HIDP)		depends on (USB_HID \|\| BT_HIDP)
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	@@ -88,7 +88,7 @@ config HID_APPLE
	MacBooks, MacBook Pros and Apple Aluminum.		MacBooks, MacBook Pros and Apple Aluminum.

	config HID_BELKIN		config HID_BELKIN
	tristate "Belkin" if EMBEDDED		tristate "Belkin Flip KVM and Wireless keyboard" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	@@ -101,14 +101,14 @@ config HID_CANDO
	Support for Cando dual touch panel.		Support for Cando dual touch panel.

	config HID_CHERRY		config HID_CHERRY
	tristate "Cherry" if EMBEDDED		tristate "Cherry Cymotion keyboard" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for Cherry Cymotion keyboard.		Support for Cherry Cymotion keyboard.

	config HID_CHICONY		config HID_CHICONY
	tristate "Chicony" if EMBEDDED		tristate "Chicony Tactical pad" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	@@ -130,20 +130,20 @@ config HID_PRODIKEYS
	and some additional multimedia keys.		and some additional multimedia keys.

	config HID_CYPRESS		config HID_CYPRESS
	tristate "Cypress" if EMBEDDED		tristate "Cypress mouse and barcode readers" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for cypress mouse and barcode readers.		Support for cypress mouse and barcode readers.

	config HID_DRAGONRISE		config HID_DRAGONRISE
	tristate "DragonRise Inc. support"		tristate "DragonRise Inc. game controller"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Say Y here if you have DragonRise Inc.game controllers.		Say Y here if you have DragonRise Inc.game controllers.

	config DRAGONRISE_FF		config DRAGONRISE_FF
	bool "DragonRise Inc. force feedback support"		bool "DragonRise Inc. force feedback"
	depends on HID_DRAGONRISE		depends on HID_DRAGONRISE
	select INPUT_FF_MEMLESS		select INPUT_FF_MEMLESS
	---help---		---help---
	@@ -157,46 +157,46 @@ config HID_EGALAX
	Support for the eGalax dual-touch panel.		Support for the eGalax dual-touch panel.

	config HID_ELECOM		config HID_ELECOM
	tristate "ELECOM"		tristate "ELECOM BM084 bluetooth mouse"
	depends on BT_HIDP		depends on BT_HIDP
	---help---		---help---
	Support for the ELECOM BM084 (bluetooth mouse).		Support for the ELECOM BM084 (bluetooth mouse).

	config HID_EZKEY		config HID_EZKEY
	tristate "Ezkey" if EMBEDDED		tristate "Ezkey BTC 8193 keyboard" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for Ezkey BTC 8193 keyboard.		Support for Ezkey BTC 8193 keyboard.

	config HID_KYE		config HID_KYE
	tristate "Kye" if EMBEDDED		tristate "Kye/Genius Ergo Mouse" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for Kye/Genius Ergo Mouse.		Support for Kye/Genius Ergo Mouse.

	config HID_GYRATION		config HID_GYRATION
	tristate "Gyration"		tristate "Gyration remote control"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Gyration remote control.		Support for Gyration remote control.

	config HID_TWINHAN		config HID_TWINHAN
	tristate "Twinhan"		tristate "Twinhan IR remote control"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Twinhan IR remote control.		Support for Twinhan IR remote control.

	config HID_KENSINGTON		config HID_KENSINGTON
	tristate "Kensington" if EMBEDDED		tristate "Kensington Slimblade Trackball" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for Kensington Slimblade Trackball.		Support for Kensington Slimblade Trackball.

	config HID_LOGITECH		config HID_LOGITECH
	tristate "Logitech" if EMBEDDED		tristate "Logitech devices" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	@@ -245,39 +245,39 @@ config HID_MAGICMOUSE
	Apple Wireless "Magic" Mouse.		Apple Wireless "Magic" Mouse.

	config HID_MICROSOFT		config HID_MICROSOFT
	tristate "Microsoft" if EMBEDDED		tristate "Microsoft non-fully HID-compliant devices" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for Microsoft devices that are not fully compliant with HID standard.		Support for Microsoft devices that are not fully compliant with HID standard.

	config HID_MOSART		config HID_MOSART
	tristate "MosArt"		tristate "MosArt dual-touch panels"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for MosArt dual-touch panels.		Support for MosArt dual-touch panels.

	config HID_MONTEREY		config HID_MONTEREY
	tristate "Monterey" if EMBEDDED		tristate "Monterey Genius KB29E keyboard" if EMBEDDED
	depends on USB_HID		depends on USB_HID
	default !EMBEDDED		default !EMBEDDED
	---help---		---help---
	Support for Monterey Genius KB29E.		Support for Monterey Genius KB29E.

	config HID_NTRIG		config HID_NTRIG
	tristate "NTrig"		tristate "N-Trig touch screen"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for N-Trig touch screen.		Support for N-Trig touch screen.

	config HID_ORTEK		config HID_ORTEK
	tristate "Ortek"		tristate "Ortek WKB-2000 wireless keyboard and mouse trackpad"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.		Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.

	config HID_PANTHERLORD		config HID_PANTHERLORD
	tristate "Pantherlord support"		tristate "Pantherlord/GreenAsia game controller"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Say Y here if you have a PantherLord/GreenAsia based game controller		Say Y here if you have a PantherLord/GreenAsia based game controller
	@@ -292,7 +292,7 @@ config PANTHERLORD_FF
	or adapter and want to enable force feedback support for it.		or adapter and want to enable force feedback support for it.

	config HID_PETALYNX		config HID_PETALYNX
	tristate "Petalynx"		tristate "Petalynx Maxter remote control"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Petalynx Maxter remote control.		Support for Petalynx Maxter remote control.
	@@ -356,7 +356,7 @@ config HID_PICOLCD_LEDS
	Provide access to PicoLCD's GPO pins via leds class.		Provide access to PicoLCD's GPO pins via leds class.

	config HID_QUANTA		config HID_QUANTA
	tristate "Quanta Optical Touch"		tristate "Quanta Optical Touch panels"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Quanta Optical Touch dual-touch panels.		Support for Quanta Optical Touch dual-touch panels.
	@@ -377,31 +377,31 @@ config HID_ROCCAT_KONE
	Support for Roccat Kone mouse.		Support for Roccat Kone mouse.

	config HID_SAMSUNG		config HID_SAMSUNG
	tristate "Samsung"		tristate "Samsung InfraRed remote control or keyboards"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Samsung InfraRed remote control or keyboards.		Support for Samsung InfraRed remote control or keyboards.

	config HID_SONY		config HID_SONY
	tristate "Sony"		tristate "Sony PS3 controller"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Sony PS3 controller.		Support for Sony PS3 controller.

	config HID_STANTUM		config HID_STANTUM
	tristate "Stantum"		tristate "Stantum multitouch panel"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Stantum multitouch panel.		Support for Stantum multitouch panel.

	config HID_SUNPLUS		config HID_SUNPLUS
	tristate "Sunplus"		tristate "Sunplus wireless desktop"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Support for Sunplus wireless desktop.		Support for Sunplus wireless desktop.

	config HID_GREENASIA		config HID_GREENASIA
	tristate "GreenAsia (Product ID 0x12) support"		tristate "GreenAsia (Product ID 0x12) game controller support"
	depends on USB_HID		depends on USB_HID
	---help---		---help---
	Say Y here if you have a GreenAsia (Product ID 0x12) based game		Say Y here if you have a GreenAsia (Product ID 0x12) based game

drivers/hid/hid-a4tech.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -133,6 +133,8 @@ static const struct hid_device_id a4_devices[] = {
	.driver_data = A4_2WHEEL_MOUSE_HACK_7 },		.driver_data = A4_2WHEEL_MOUSE_HACK_7 },
	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D),		{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D),
	.driver_data = A4_2WHEEL_MOUSE_HACK_B8 },		.driver_data = A4_2WHEEL_MOUSE_HACK_B8 },
			{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649),
			.driver_data = A4_2WHEEL_MOUSE_HACK_B8 },
	{ }		{ }
	};		};
	MODULE_DEVICE_TABLE(hid, a4_devices);		MODULE_DEVICE_TABLE(hid, a4_devices);

drivers/hid/hid-core.c

+3 −0

drivers/hid/hid-debug.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -570,6 +570,8 @@ void hid_debug_event(struct hid_device hdev, char buf)
	buf[i];		buf[i];
	list->tail = (list->tail + i) % HID_DEBUG_BUFSIZE;		list->tail = (list->tail + i) % HID_DEBUG_BUFSIZE;
	}		}

			wake_up_interruptible(&hdev->debug_wait);
	}		}
	EXPORT_SYMBOL_GPL(hid_debug_event);		EXPORT_SYMBOL_GPL(hid_debug_event);

drivers/hid/hid-ids.h

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1241,6 +1241,7 @@ static const struct hid_device_id hid_blacklist[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },		{ HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },		{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },		{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
	#if defined(CONFIG_HID_ACRUX_FF) \|\| defined(CONFIG_HID_ACRUX_FF_MODULE)		#if defined(CONFIG_HID_ACRUX_FF) \|\| defined(CONFIG_HID_ACRUX_FF_MODULE)
	{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },		{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
	#endif		#endif
	@@ -1377,6 +1378,8 @@ static const struct hid_device_id hid_blacklist[] = {
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },		{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },		{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM, USB_DEVICE_ID_MTP) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_STM, USB_DEVICE_ID_MTP_STM) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_STANTUM_SITRONIX, USB_DEVICE_ID_MTP_SITRONIX) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },		{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },		{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },		{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@
	#define USB_VENDOR_ID_A4TECH 0x09da		#define USB_VENDOR_ID_A4TECH 0x09da
	#define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006		#define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006
	#define USB_DEVICE_ID_A4TECH_X5_005D 0x000a		#define USB_DEVICE_ID_A4TECH_X5_005D 0x000a
			#define USB_DEVICE_ID_A4TECH_RP_649 0x001a

	#define USB_VENDOR_ID_AASHIMA 0x06d6		#define USB_VENDOR_ID_AASHIMA 0x06d6
	#define USB_DEVICE_ID_AASHIMA_GAMEPAD 0x0025		#define USB_DEVICE_ID_AASHIMA_GAMEPAD 0x0025
	@@ -142,6 +143,7 @@
	#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE 0x0051		#define USB_DEVICE_ID_CH_FLIGHT_SIM_ECLIPSE_YOKE 0x0051
	#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE 0x00ff		#define USB_DEVICE_ID_CH_FLIGHT_SIM_YOKE 0x00ff
	#define USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK 0x00d3		#define USB_DEVICE_ID_CH_3AXIS_5BUTTON_STICK 0x00d3
			#define USB_DEVICE_ID_CH_AXIS_295 0x001c

	#define USB_VENDOR_ID_CHERRY 0x046a		#define USB_VENDOR_ID_CHERRY 0x046a
	#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023		#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
	@@ -485,6 +487,12 @@
	#define USB_VENDOR_ID_STANTUM 0x1f87		#define USB_VENDOR_ID_STANTUM 0x1f87
	#define USB_DEVICE_ID_MTP 0x0002		#define USB_DEVICE_ID_MTP 0x0002

			#define USB_VENDOR_ID_STANTUM_STM 0x0483
			#define USB_DEVICE_ID_MTP_STM 0x3261

			#define USB_VENDOR_ID_STANTUM_SITRONIX 0x1403
			#define USB_DEVICE_ID_MTP_SITRONIX 0x5001

	#define USB_VENDOR_ID_SUN 0x0430		#define USB_VENDOR_ID_SUN 0x0430
	#define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab		#define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab