Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus (447753d9) · Commits · e / devices / android_kernel_teracube_emerald

drivers/hid/hid-core.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,8 +39,6 @@
	* Version Information		* Version Information
	*/		*/

	#define DRIVER_VERSION "v2.6"
	#define DRIVER_AUTHOR "Andreas Gal, Vojtech Pavlik, Jiri Kosina"
	#define DRIVER_DESC "HID core driver"		#define DRIVER_DESC "HID core driver"
	#define DRIVER_LICENSE "GPL"		#define DRIVER_LICENSE "GPL"

	@@ -1294,6 +1292,7 @@ static const struct hid_device_id hid_blacklist[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },		{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },		{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },		{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },		{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },		{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
	@@ -1326,6 +1325,8 @@ static const struct hid_device_id hid_blacklist[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },		{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },
	@@ -1620,6 +1621,7 @@ static const struct hid_device_id hid_ignore_list[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },		{ HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },		{ HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },		{ HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },
			{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_KYE, 0x0058) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },		{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },		{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },		{ HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_MOBILECASSY) },
	@@ -1918,5 +1920,8 @@ static void __exit hid_exit(void)
	module_init(hid_init);		module_init(hid_init);
	module_exit(hid_exit);		module_exit(hid_exit);

			MODULE_AUTHOR("Andreas Gal");
			MODULE_AUTHOR("Vojtech Pavlik");
			MODULE_AUTHOR("Jiri Kosina");
	MODULE_LICENSE(DRIVER_LICENSE);		MODULE_LICENSE(DRIVER_LICENSE);

drivers/hid/hid-cypress.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -126,6 +126,8 @@ static const struct hid_device_id cp_devices[] = {
	.driver_data = CP_RDESC_SWAPPED_MIN_MAX },		.driver_data = CP_RDESC_SWAPPED_MIN_MAX },
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2),		{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2),
	.driver_data = CP_RDESC_SWAPPED_MIN_MAX },		.driver_data = CP_RDESC_SWAPPED_MIN_MAX },
			{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3),
			.driver_data = CP_RDESC_SWAPPED_MIN_MAX },
	{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE),		{ HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE),
	.driver_data = CP_2WHEEL_MOUSE_HACK },		.driver_data = CP_2WHEEL_MOUSE_HACK },
	{ }		{ }

drivers/hid/hid-ids.h

+7 −0

drivers/hid/hid-lg.c

+33 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@
	#define LG_NOGET 0x100		#define LG_NOGET 0x100
	#define LG_FF 0x200		#define LG_FF 0x200
	#define LG_FF2 0x400		#define LG_FF2 0x400
			#define LG_RDESC_REL_ABS 0x800

	/*		/*
	* Certain Logitech keyboards send in report #3 keys which are far		* Certain Logitech keyboards send in report #3 keys which are far
	@@ -51,6 +52,13 @@ static void lg_report_fixup(struct hid_device hdev, __u8 rdesc,
	rdesc[84] = rdesc[89] = 0x4d;		rdesc[84] = rdesc[89] = 0x4d;
	rdesc[85] = rdesc[90] = 0x10;		rdesc[85] = rdesc[90] = 0x10;
	}		}
			if ((quirks & LG_RDESC_REL_ABS) && rsize >= 50 &&
			rdesc[32] == 0x81 && rdesc[33] == 0x06 &&
			rdesc[49] == 0x81 && rdesc[50] == 0x06) {
			dev_info(&hdev->dev, "fixing up rel/abs in Logitech "
			"report descriptor\n");
			rdesc[33] = rdesc[50] = 0x02;
			}
	}		}

	#define lg_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \		#define lg_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \
	@@ -89,6 +97,22 @@ static int lg_ultrax_remote_mapping(struct hid_input *hi,
	return 1;		return 1;
	}		}

			static int lg_dinovo_mapping(struct hid_input hi, struct hid_usage usage,
			unsigned long *bit, int max)
			{
			if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
			return 0;

			switch (usage->hid & HID_USAGE) {

			case 0x00d: lg_map_key_clear(KEY_MEDIA); break;
			default:
			return 0;

			}
			return 1;
			}

	static int lg_wireless_mapping(struct hid_input hi, struct hid_usage usage,		static int lg_wireless_mapping(struct hid_input hi, struct hid_usage usage,
	unsigned long *bit, int max)		unsigned long *bit, int max)
	{		{
	@@ -164,6 +188,10 @@ static int lg_input_mapping(struct hid_device hdev, struct hid_input hi,
	lg_ultrax_remote_mapping(hi, usage, bit, max))		lg_ultrax_remote_mapping(hi, usage, bit, max))
	return 1;		return 1;

			if (hdev->product == USB_DEVICE_ID_DINOVO_MINI &&
			lg_dinovo_mapping(hi, usage, bit, max))
			return 1;

	if ((quirks & LG_WIRELESS) && lg_wireless_mapping(hi, usage, bit, max))		if ((quirks & LG_WIRELESS) && lg_wireless_mapping(hi, usage, bit, max))
	return 1;		return 1;

	@@ -303,8 +331,13 @@ static const struct hid_device_id lg_devices[] = {
	.driver_data = LG_FF },		.driver_data = LG_FF },
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),		{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),
	.driver_data = LG_FF2 },		.driver_data = LG_FF2 },
			{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACENAVIGATOR),
			.driver_data = LG_RDESC_REL_ABS },
			{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_SPACETRAVELLER),
			.driver_data = LG_RDESC_REL_ABS },
	{ }		{ }
	};		};

	MODULE_DEVICE_TABLE(hid, lg_devices);		MODULE_DEVICE_TABLE(hid, lg_devices);

	static struct hid_driver lg_driver = {		static struct hid_driver lg_driver = {

drivers/hid/usbhid/hid-core.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -41,8 +41,6 @@
	* Version Information		* Version Information
	*/		*/

	#define DRIVER_VERSION "v2.6"
	#define DRIVER_AUTHOR "Andreas Gal, Vojtech Pavlik, Jiri Kosina"
	#define DRIVER_DESC "USB HID core driver"		#define DRIVER_DESC "USB HID core driver"
	#define DRIVER_LICENSE "GPL"		#define DRIVER_LICENSE "GPL"

	@@ -998,6 +996,7 @@ static int usbhid_start(struct hid_device *hid)
	usbhid->urbctrl->transfer_dma = usbhid->ctrlbuf_dma;		usbhid->urbctrl->transfer_dma = usbhid->ctrlbuf_dma;
	usbhid->urbctrl->transfer_flags \|= (URB_NO_TRANSFER_DMA_MAP \| URB_NO_SETUP_DMA_MAP);		usbhid->urbctrl->transfer_flags \|= (URB_NO_TRANSFER_DMA_MAP \| URB_NO_SETUP_DMA_MAP);

			if (!(hid->quirks & HID_QUIRK_NO_INIT_REPORTS))
	usbhid_init_reports(hid);		usbhid_init_reports(hid);

	set_bit(HID_STARTED, &usbhid->iofl);		set_bit(HID_STARTED, &usbhid->iofl);
	@@ -1395,8 +1394,7 @@ static int __init hid_init(void)
	retval = usb_register(&hid_driver);		retval = usb_register(&hid_driver);
	if (retval)		if (retval)
	goto usb_register_fail;		goto usb_register_fail;
	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"		printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
	DRIVER_DESC "\n");

	return 0;		return 0;
	usb_register_fail:		usb_register_fail:
	@@ -1423,6 +1421,8 @@ static void __exit hid_exit(void)
	module_init(hid_init);		module_init(hid_init);
	module_exit(hid_exit);		module_exit(hid_exit);

	MODULE_AUTHOR(DRIVER_AUTHOR);		MODULE_AUTHOR("Andreas Gal");
			MODULE_AUTHOR("Vojtech Pavlik");
			MODULE_AUTHOR("Jiri Kosina");
	MODULE_DESCRIPTION(DRIVER_DESC);		MODULE_DESCRIPTION(DRIVER_DESC);
	MODULE_LICENSE(DRIVER_LICENSE);		MODULE_LICENSE(DRIVER_LICENSE);

Original line number	Original line	Diff line number	Diff line
	@@ -117,6 +117,7 @@
	#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2		#define USB_DEVICE_ID_CH_PRO_PEDALS 0x00f2
	#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4		#define USB_DEVICE_ID_CH_COMBATSTICK 0x00f4
	#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_VENDOR_ID_CHERRY 0x046a		#define USB_VENDOR_ID_CHERRY 0x046a
	#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023		#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
	@@ -145,6 +146,7 @@
	#define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE 0x7417		#define USB_DEVICE_ID_CYPRESS_ULTRAMOUSE 0x7417
	#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61		#define USB_DEVICE_ID_CYPRESS_BARCODE_1 0xde61
	#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64		#define USB_DEVICE_ID_CYPRESS_BARCODE_2 0xde64
			#define USB_DEVICE_ID_CYPRESS_BARCODE_3 0xbca1

	#define USB_VENDOR_ID_DEALEXTREAME 0x10c5		#define USB_VENDOR_ID_DEALEXTREAME 0x10c5
	#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a		#define USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701 0x819a
	@@ -304,6 +306,8 @@
	#define USB_DEVICE_ID_S510_RECEIVER_2 0xc517		#define USB_DEVICE_ID_S510_RECEIVER_2 0xc517
	#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500 0xc512		#define USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500 0xc512
	#define USB_DEVICE_ID_MX3000_RECEIVER 0xc513		#define USB_DEVICE_ID_MX3000_RECEIVER 0xc513
			#define USB_DEVICE_ID_SPACETRAVELLER 0xc623
			#define USB_DEVICE_ID_SPACENAVIGATOR 0xc626
	#define USB_DEVICE_ID_DINOVO_DESKTOP 0xc704		#define USB_DEVICE_ID_DINOVO_DESKTOP 0xc704
	#define USB_DEVICE_ID_DINOVO_EDGE 0xc714		#define USB_DEVICE_ID_DINOVO_EDGE 0xc714
	#define USB_DEVICE_ID_DINOVO_MINI 0xc71f		#define USB_DEVICE_ID_DINOVO_MINI 0xc71f
	@@ -346,6 +350,9 @@
	#define USB_VENDOR_ID_NEC 0x073e		#define USB_VENDOR_ID_NEC 0x073e
	#define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301		#define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301

			#define USB_VENDOR_ID_NEXTWINDOW 0x1926
			#define USB_DEVICE_ID_NEXTWINDOW_TOUCHSCREEN 0x0003

	#define USB_VENDOR_ID_NTRIG 0x1b96		#define USB_VENDOR_ID_NTRIG 0x1b96
	#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001		#define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN 0x0001