Merge branches 'upstream' and 'ntrig-multitouch' into for-linus (6341de05) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/hid/Kconfig

+77 −15

Original line number	Diff line number	Diff line
		@@ -116,9 +116,16 @@ config HID_CYPRESS
		---help---
		Support for cypress mouse and barcode readers.

		config DRAGONRISE_FF
		tristate "DragonRise Inc. force feedback support"
		config HID_DRAGONRISE
		tristate "DragonRise Inc. support" if EMBEDDED
		depends on USB_HID
		default !EMBEDDED
		---help---
		Say Y here if you have DragonRise Inc.game controllers.

		config DRAGONRISE_FF
		bool "DragonRise Inc. force feedback support"
		depends on HID_DRAGONRISE
		select INPUT_FF_MEMLESS
		---help---
		Say Y here if you want to enable force feedback support for DragonRise Inc.
		@@ -160,7 +167,7 @@ config HID_LOGITECH
		Support for Logitech devices that are not fully compliant with HID standard.

		config LOGITECH_FF
		bool "Logitech force feedback"
		bool "Logitech force feedback support"
		depends on HID_LOGITECH
		select INPUT_FF_MEMLESS
		help
		@@ -176,7 +183,7 @@ config LOGITECH_FF
		force feedback.

		config LOGIRUMBLEPAD2_FF
		bool "Logitech Rumblepad 2 force feedback"
		bool "Logitech Rumblepad 2 force feedback support"
		depends on HID_LOGITECH
		select INPUT_FF_MEMLESS
		help
		@@ -211,11 +218,19 @@ config HID_PANTHERLORD
		---help---
		Support for PantherLord/GreenAsia based device support.

		config HID_PANTHERLORD
		tristate "Pantherlord support" if EMBEDDED
		depends on USB_HID
		default !EMBEDDED
		---help---
		Say Y here if you have a PantherLord/GreenAsia based game controller
		or adapter.

		config PANTHERLORD_FF
		bool "Pantherlord force feedback support"
		depends on HID_PANTHERLORD
		select INPUT_FF_MEMLESS
		help
		---help---
		Say Y here if you have a PantherLord/GreenAsia based game controller
		or adapter and want to enable force feedback support for it.

		@@ -247,15 +262,38 @@ config HID_SUNPLUS
		---help---
		Support for Sunplus wireless desktop.

		config GREENASIA_FF
		tristate "GreenAsia (Product ID 0x12) force feedback support"
		config HID_GREENASIA
		tristate "GreenAsia (Product ID 0x12) support" if EMBEDDED
		depends on USB_HID
		default !EMBEDDED
		---help---
		Say Y here if you have a GreenAsia (Product ID 0x12) based game
		controller or adapter.

		config GREENASIA_FF
		bool "GreenAsia (Product ID 0x12) force feedback support"
		depends on HID_GREENASIA
		select INPUT_FF_MEMLESS
		---help---
		Say Y here if you have a GreenAsia (Product ID 0x12) based game controller
		(like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
		and want to enable force feedback support for it.

		config HID_SMARTJOYPLUS
		tristate "SmartJoy PLUS PS2/USB adapter support" if EMBEDDED
		depends on USB_HID
		default !EMBEDDED
		---help---
		Support for SmartJoy PLUS PS2/USB adapter.

		config SMARTJOYPLUS_FF
		bool "SmartJoy PLUS PS2/USB adapter force feedback support"
		depends on HID_SMARTJOYPLUS
		select INPUT_FF_MEMLESS
		---help---
		Say Y here if you have a SmartJoy PLUS PS2/USB adapter and want to
		enable force feedback support for it.

		config HID_TOPSEED
		tristate "TopSeed Cyberlink remote control support" if EMBEDDED
		depends on USB_HID
		@@ -263,21 +301,45 @@ config HID_TOPSEED
		---help---
		Say Y if you have a TopSeed Cyberlink remote control.

		config THRUSTMASTER_FF
		tristate "ThrustMaster devices support"
		config HID_THRUSTMASTER
		tristate "ThrustMaster devices support" if EMBEDDED
		depends on USB_HID
		default !EMBEDDED
		---help---
		Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
		a THRUSTMASTER Ferrari GT Rumble Wheel.

		config THRUSTMASTER_FF
		bool "ThrustMaster devices force feedback support"
		depends on HID_THRUSTMASTER
		select INPUT_FF_MEMLESS
		help
		---help---
		Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
		a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel.
		a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel and
		want to enable force feedback support for it.

		config ZEROPLUS_FF
		tristate "Zeroplus based game controller support"
		config HID_WACOM
		tristate "Wacom Bluetooth devices support" if EMBEDDED
		depends on BT_HIDP
		default !EMBEDDED
		---help---
		Support for Wacom Graphire Bluetooth tablet.

		config HID_ZEROPLUS
		tristate "Zeroplus based game controller support" if EMBEDDED
		depends on USB_HID
		select INPUT_FF_MEMLESS
		help
		default !EMBEDDED
		---help---
		Say Y here if you have a Zeroplus based game controller.

		config ZEROPLUS_FF
		bool "Zeroplus based game controller force feedback support"
		depends on HID_ZEROPLUS
		select INPUT_FF_MEMLESS
		---help---
		Say Y here if you have a Zeroplus based game controller and want
		to have force feedback support for it.

		endmenu

		endif # HID_SUPPORT

drivers/hid/Makefile

+6 −4

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ obj-$(CONFIG_HID_BELKIN) += hid-belkin.o
		obj-$(CONFIG_HID_CHERRY) += hid-cherry.o
		obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
		obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o
		obj-$(CONFIG_DRAGONRISE_FF) += hid-drff.o
		obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o
		obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
		obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
		obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o
		@@ -34,12 +34,14 @@ obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o
		obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
		obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
		obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
		obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
		obj-$(CONFIG_HID_SONY) += hid-sony.o
		obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
		obj-$(CONFIG_GREENASIA_FF) += hid-gaff.o
		obj-$(CONFIG_THRUSTMASTER_FF) += hid-tmff.o
		obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
		obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o
		obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o
		obj-$(CONFIG_ZEROPLUS_FF) += hid-zpff.o
		obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o
		obj-$(CONFIG_HID_WACOM) += hid-wacom.o

		obj-$(CONFIG_USB_HID) += usbhid/
		obj-$(CONFIG_USB_MOUSE) += usbhid/

drivers/hid/hid-apple.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -436,10 +436,6 @@ static const struct hid_device_id apple_devices[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
		.driver_data = APPLE_NUMLOCK_EMULATION \| APPLE_HAS_FN },

		/* Apple wireless Mighty Mouse */
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),
		.driver_data = APPLE_MIGHTYMOUSE \| APPLE_INVERT_HWHEEL },

		{ }
		};
		MODULE_DEVICE_TABLE(hid, apple_devices);

drivers/hid/hid-core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1312,6 +1312,8 @@ static const struct hid_device_id hid_blacklist[] = {
		{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_SMARTJOY_PLUS) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_WACOM, USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

drivers/hid/hid-debug.c

+21 −2

Original line number	Diff line number	Diff line
		@@ -137,6 +137,14 @@ static const struct hid_usage_entry hid_usage_table[] = {
		{0, 0x44, "BarrelSwitch"},
		{0, 0x45, "Eraser"},
		{0, 0x46, "TabletPick"},
		{0, 0x47, "Confidence"},
		{0, 0x48, "Width"},
		{0, 0x49, "Height"},
		{0, 0x51, "ContactID"},
		{0, 0x52, "InputMode"},
		{0, 0x53, "DeviceIndex"},
		{0, 0x54, "ContactCount"},
		{0, 0x55, "ContactMaximumNumber"},
		{ 15, 0, "PhysicalInterfaceDevice" },
		{0, 0x00, "Undefined"},
		{0, 0x01, "Physical_Interface_Device"},
		@@ -514,9 +522,11 @@ static const char *events[EV_MAX + 1] = {
		[EV_FF_STATUS] = "ForceFeedbackStatus",
		};

		static const char *syncs[2] = {
		static const char *syncs[3] = {
		[SYN_REPORT] = "Report", [SYN_CONFIG] = "Config",
		[SYN_MT_REPORT] = "MT Report",
		};

		static const char *keys[KEY_MAX + 1] = {
		[KEY_RESERVED] = "Reserved", [KEY_ESC] = "Esc",
		[KEY_1] = "1", [KEY_2] = "2",
		@@ -736,6 +746,15 @@ static const char *absolutes[ABS_MAX + 1] = {
		[ABS_DISTANCE] = "Distance", [ABS_TILT_X] = "XTilt",
		[ABS_TILT_Y] = "YTilt", [ABS_TOOL_WIDTH] = "ToolWidth",
		[ABS_VOLUME] = "Volume", [ABS_MISC] = "Misc",
		[ABS_MT_TOUCH_MAJOR] = "MTMajor",
		[ABS_MT_TOUCH_MINOR] = "MTMinor",
		[ABS_MT_WIDTH_MAJOR] = "MTMajorW",
		[ABS_MT_WIDTH_MINOR] = "MTMinorW",
		[ABS_MT_ORIENTATION] = "MTOrientation",
		[ABS_MT_POSITION_X] = "MTPositionX",
		[ABS_MT_POSITION_Y] = "MTPositionY",
		[ABS_MT_TOOL_TYPE] = "MTToolType",
		[ABS_MT_BLOB_ID] = "MTBlobID",
		};

		static const char *misc[MSC_MAX + 1] = {