Merge branch 'upstream' into for-linus (fc73697b) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/hid/Kconfig

+6 −0

Original line number	Diff line number	Diff line
		@@ -148,6 +148,12 @@ config HID_EGALAX
		---help---
		Support for the eGalax dual-touch panel.

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

		config HID_EZKEY
		tristate "Ezkey" if EMBEDDED
		depends on USB_HID

drivers/hid/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ obj-$(CONFIG_HID_CHICONY) += hid-chicony.o
		obj-$(CONFIG_HID_CYPRESS) += hid-cypress.o
		obj-$(CONFIG_HID_DRAGONRISE) += hid-drff.o
		obj-$(CONFIG_HID_EGALAX) += hid-egalax.o
		obj-$(CONFIG_HID_ELECOM) += hid-elecom.o
		obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o
		obj-$(CONFIG_HID_GYRATION) += hid-gyration.o
		obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o

drivers/hid/hid-core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1294,6 +1294,7 @@ static const struct hid_device_id hid_blacklist[] = {
		{ 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_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
		{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

drivers/hid/hid-elecom.c

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		/*
		* HID driver for Elecom BM084 (bluetooth mouse).
		* Removes a non-existing horizontal wheel from
		* the HID descriptor.
		* (This module is based on "hid-ortek".)
		*
		* Copyright (c) 2010 Richard Nauber <Richard.Nauber@gmail.com>
		*/

		/*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the Free
		* Software Foundation; either version 2 of the License, or (at your option)
		* any later version.
		*/

		#include <linux/device.h>
		#include <linux/hid.h>
		#include <linux/module.h>

		#include "hid-ids.h"

		static void elecom_report_fixup(struct hid_device hdev, __u8 rdesc,
		unsigned int rsize)
		{
		if (rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) {
		dev_info(&hdev->dev, "Fixing up Elecom BM084 "
		"report descriptor.\n");
		rdesc[47] = 0x00;
		}
		}

		static const struct hid_device_id elecom_devices[] = {
		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084)},
		{ }
		};
		MODULE_DEVICE_TABLE(hid, elecom_devices);

		static struct hid_driver elecom_driver = {
		.name = "elecom",
		.id_table = elecom_devices,
		.report_fixup = elecom_report_fixup
		};

		static int __init elecom_init(void)
		{
		return hid_register_driver(&elecom_driver);
		}

		static void __exit elecom_exit(void)
		{
		hid_unregister_driver(&elecom_driver);
		}

		module_init(elecom_init);
		module_exit(elecom_exit);
		MODULE_LICENSE("GPL");

drivers/hid/hid-ids.h

+42 −39

Original line number	Diff line number	Diff line
		@@ -187,18 +187,21 @@
		#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001
		#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d

		#define USB_VENDOR_ID_ELECOM 0x056e
		#define USB_DEVICE_ID_ELECOM_BM084 0x0061

		#define USB_VENDOR_ID_ELO 0x04E7
		#define USB_DEVICE_ID_ELO_TS2700 0x0020

		#define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f
		#define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100

		#define USB_VENDOR_ID_ETURBOTOUCH 0x22b9
		#define USB_DEVICE_ID_ETURBOTOUCH 0x0006

		#define USB_VENDOR_ID_ETT 0x0664
		#define USB_DEVICE_ID_TC5UH 0x0309

		#define USB_VENDOR_ID_ETURBOTOUCH 0x22b9
		#define USB_DEVICE_ID_ETURBOTOUCH 0x0006

		#define USB_VENDOR_ID_EZKEY 0x0518
		#define USB_DEVICE_ID_BTC_8193 0x0002

		@@ -296,9 +299,16 @@
		#define USB_VENDOR_ID_KBGEAR 0x084e
		#define USB_DEVICE_ID_KBGEAR_JAMSTUDIO 0x1001

		#define USB_VENDOR_ID_KENSINGTON 0x047d
		#define USB_DEVICE_ID_KS_SLIMBLADE 0x2041

		#define USB_VENDOR_ID_KWORLD 0x1b80
		#define USB_DEVICE_ID_KWORLD_RADIO_FM700 0xd700

		#define USB_VENDOR_ID_KYE 0x0458
		#define USB_DEVICE_ID_KYE_ERGO_525V 0x0087
		#define USB_DEVICE_ID_KYE_GPEN_560 0x5003

		#define USB_VENDOR_ID_LABTEC 0x1020
		#define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006

		@@ -318,9 +328,6 @@
		#define USB_DEVICE_ID_LD_POWERCONTROL 0x2030
		#define USB_DEVICE_ID_LD_MACHINETEST 0x2040

		#define USB_VENDOR_ID_KENSINGTON 0x047d
		#define USB_DEVICE_ID_KS_SLIMBLADE 0x2041

		#define USB_VENDOR_ID_LOGITECH 0x046d
		#define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
		#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST 0xc110
		@@ -376,16 +383,16 @@
		#define USB_VENDOR_ID_MONTEREY 0x0566
		#define USB_DEVICE_ID_GENIUS_KB29E 0x3004

		#define USB_VENDOR_ID_NCR 0x0404
		#define USB_DEVICE_ID_NCR_FIRST 0x0300
		#define USB_DEVICE_ID_NCR_LAST 0x03ff

		#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
		#define USB_DEVICE_ID_N_S_HARMONY 0xc359

		#define USB_VENDOR_ID_NATSU 0x08b7
		#define USB_DEVICE_ID_NATSU_GAMEPAD 0x0001

		#define USB_VENDOR_ID_NCR 0x0404
		#define USB_DEVICE_ID_NCR_FIRST 0x0300
		#define USB_DEVICE_ID_NCR_LAST 0x03ff

		#define USB_VENDOR_ID_NEC 0x073e
		#define USB_DEVICE_ID_NEC_USB_GAME_PAD 0x0301

		@@ -439,16 +446,16 @@
		#define USB_VENDOR_ID_PRODIGE 0x05af
		#define USB_DEVICE_ID_PRODIGE_CORDLESS 0x3062

		#define USB_VENDOR_ID_QUANTA 0x0408
		#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000
		#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001

		#define USB_VENDOR_ID_ROCCAT 0x1e7d
		#define USB_DEVICE_ID_ROCCAT_KONE 0x2ced

		#define USB_VENDOR_ID_SAITEK 0x06a3
		#define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17

		#define USB_VENDOR_ID_QUANTA 0x0408
		#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH 0x3000
		#define USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN 0x3001

		#define USB_VENDOR_ID_SAMSUNG 0x0419
		#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
		#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600
		@@ -472,15 +479,15 @@

		#define USB_VENDOR_ID_THRUSTMASTER 0x044f

		#define USB_VENDOR_ID_TOUCHPACK 0x1bfd
		#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688

		#define USB_VENDOR_ID_TOPMAX 0x0663
		#define USB_DEVICE_ID_TOPMAX_COBRAPAD 0x0103

		#define USB_VENDOR_ID_TOPSEED 0x0766
		#define USB_DEVICE_ID_TOPSEED_CYBERLINK 0x0204

		#define USB_VENDOR_ID_TOUCHPACK 0x1bfd
		#define USB_DEVICE_ID_TOUCHPACK_RTS 0x1688

		#define USB_VENDOR_ID_TURBOX 0x062a
		#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201

		@@ -522,9 +529,5 @@
		#define USB_VENDOR_ID_ZYDACRON 0x13EC
		#define USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL 0x0006

		#define USB_VENDOR_ID_KYE 0x0458
		#define USB_DEVICE_ID_KYE_ERGO_525V 0x0087
		#define USB_DEVICE_ID_KYE_GPEN_560 0x5003


		#endif