Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1c9b9ff authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid',... 

Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid', 'for-4.6/logitech', 'for-4.6/multitouch', 'for-4.6/penmount', 'for-4.6/sony', 'for-4.6/thingm', 'for-4.6/upstream' and 'for-4.6/wacom' into for-linus
parents c14022bf ad8ddc57 3b654288 af2e628d d3e69b9a 5f66872c 1adf904e 1d1b564f f9a82c20 f6205161

drivers/hid/Kconfig

+6 −0
Original line number Original line Diff line number Diff line
@@ -196,6 +196,12 @@ config HID_PRODIKEYS 
	  multimedia keyboard, but will lack support for the musical keyboard

	  multimedia keyboard, but will lack support for the musical keyboard

	  and some additional multimedia keys.

	  and some additional multimedia keys.





config HID_CMEDIA

	tristate "CMedia CM6533 HID audio jack controls"

	depends on HID

	---help---

	Support for CMedia CM6533 HID audio jack controls.



config HID_CP2112

config HID_CP2112

	tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"

	tristate "Silicon Labs CP2112 HID USB-to-SMBus Bridge support"

	depends on USB_HID && I2C && GPIOLIB

	depends on USB_HID && I2C && GPIOLIB

drivers/hid/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ obj-$(CONFIG_HID_BELKIN) += hid-belkin.o 
obj-$(CONFIG_HID_BETOP_FF)	+= hid-betopff.o

obj-$(CONFIG_HID_BETOP_FF)	+= hid-betopff.o

obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o

obj-$(CONFIG_HID_CHERRY)	+= hid-cherry.o

obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o

obj-$(CONFIG_HID_CHICONY)	+= hid-chicony.o

obj-$(CONFIG_HID_CMEDIA)	+= hid-cmedia.o

obj-$(CONFIG_HID_CORSAIR)	+= hid-corsair.o

obj-$(CONFIG_HID_CORSAIR)	+= hid-corsair.o

obj-$(CONFIG_HID_CP2112)	+= hid-cp2112.o

obj-$(CONFIG_HID_CP2112)	+= hid-cp2112.o

obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o

obj-$(CONFIG_HID_CYPRESS)	+= hid-cypress.o

drivers/hid/hid-cmedia.c

0 → 100644
+168 −0
Original line number Original line Diff line number Diff line 
/*

 * HID driver for CMedia CM6533 audio jack controls

 *

 * Copyright (C) 2015 Ben Chen <ben_chen@bizlinktech.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/device.h>

#include <linux/hid.h>

#include <linux/module.h>

#include "hid-ids.h"



MODULE_AUTHOR("Ben Chen");

MODULE_DESCRIPTION("CM6533 HID jack controls");

MODULE_LICENSE("GPL");



#define CM6533_JD_TYPE_COUNT      1

#define CM6533_JD_RAWEV_LEN	 16

#define CM6533_JD_SFX_OFFSET	  8



/*

*

*CM6533 audio jack HID raw events:

*

*Plug in:

*01000600 002083xx 080008c0 10000000

*about 3 seconds later...

*01000a00 002083xx 08000380 10000000

*01000600 002083xx 08000380 10000000

*

*Plug out:

*01000400 002083xx 080008c0 x0000000

*/



static const u8 ji_sfx[] = { 0x08, 0x00, 0x08, 0xc0 };

static const u8 ji_in[]  = { 0x01, 0x00, 0x06, 0x00 };

static const u8 ji_out[] = { 0x01, 0x00, 0x04, 0x00 };



static int jack_switch_types[CM6533_JD_TYPE_COUNT] = {

	SW_HEADPHONE_INSERT,

};



struct cmhid {

	struct input_dev *input_dev;

	struct hid_device *hid;

	unsigned short switch_map[CM6533_JD_TYPE_COUNT];

};



static void hp_ev(struct hid_device *hid, struct cmhid *cm, int value)

{

	input_report_switch(cm->input_dev, SW_HEADPHONE_INSERT, value);

	input_sync(cm->input_dev);

}



static int cmhid_raw_event(struct hid_device *hid, struct hid_report *report,

	 u8 *data, int len)

{

	struct cmhid *cm = hid_get_drvdata(hid);



	if (len != CM6533_JD_RAWEV_LEN)

		goto out;

	if (memcmp(data+CM6533_JD_SFX_OFFSET, ji_sfx, sizeof(ji_sfx)))

		goto out;



	if (!memcmp(data, ji_out, sizeof(ji_out))) {

		hp_ev(hid, cm, 0);

		goto out;

	}

	if (!memcmp(data, ji_in, sizeof(ji_in))) {

		hp_ev(hid, cm, 1);

		goto out;

	}



out:

	return 0;

}



static int cmhid_input_configured(struct hid_device *hid,

		struct hid_input *hidinput)

{

	struct input_dev *input_dev = hidinput->input;

	struct cmhid *cm = hid_get_drvdata(hid);

	int i;



	cm->input_dev = input_dev;

	memcpy(cm->switch_map, jack_switch_types, sizeof(cm->switch_map));

	input_dev->evbit[0] = BIT(EV_SW);

	for (i = 0; i < CM6533_JD_TYPE_COUNT; i++)

		input_set_capability(cm->input_dev,

				EV_SW, jack_switch_types[i]);

	return 0;

}



static int cmhid_input_mapping(struct hid_device *hid,

		struct hid_input *hi, struct hid_field *field,

		struct hid_usage *usage, unsigned long **bit, int *max)

{

	return -1;

}



static int cmhid_probe(struct hid_device *hid, const struct hid_device_id *id)

{

	int ret;

	struct cmhid *cm;



	cm = kzalloc(sizeof(struct cmhid), GFP_KERNEL);

	if (!cm) {

		ret = -ENOMEM;

		goto allocfail;

	}



	cm->hid = hid;



	hid->quirks |= HID_QUIRK_HIDINPUT_FORCE;

	hid_set_drvdata(hid, cm);



	ret = hid_parse(hid);

	if (ret) {

		hid_err(hid, "parse failed\n");

		goto fail;

	}



	ret = hid_hw_start(hid, HID_CONNECT_DEFAULT | HID_CONNECT_HIDDEV_FORCE);

	if (ret) {

		hid_err(hid, "hw start failed\n");

		goto fail;

	}



	return 0;

fail:

	kfree(cm);

allocfail:

	return ret;

}



static void cmhid_remove(struct hid_device *hid)

{

	struct cmhid *cm = hid_get_drvdata(hid);



	hid_hw_stop(hid);

	kfree(cm);

}



static const struct hid_device_id cmhid_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },

	{ }

};

MODULE_DEVICE_TABLE(hid, cmhid_devices);



static struct hid_driver cmhid_driver = {

	.name = "cm6533_jd",

	.id_table = cmhid_devices,

	.raw_event = cmhid_raw_event,

	.input_configured = cmhid_input_configured,

	.probe = cmhid_probe,

	.remove = cmhid_remove,

	.input_mapping = cmhid_input_mapping,

};

module_hid_driver(cmhid_driver);

drivers/hid/hid-core.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1965,6 +1965,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICOLCD_BOOTLOADER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD) },

	{ 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_NE4K_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP) },
@@ -2049,6 +2050,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_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_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },

	{ 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_THINGM, USB_DEVICE_ID_BLINK1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },
@@ -2097,6 +2099,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_RAZER, USB_DEVICE_ID_RAZER_BLADE_14) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CMEDIA, USB_DEVICE_ID_CM6533) },

	{ }

	{ }

};

};

drivers/hid/hid-dr.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ static inline int drff_init(struct hid_device *hid) 
 * descriptor. In any case, it's a wonder it works on Windows.

 * descriptor. In any case, it's a wonder it works on Windows.

 *

 *

 *  Usage Page (Desktop),             ; Generic desktop controls (01h)

 *  Usage Page (Desktop),             ; Generic desktop controls (01h)

 *  Usage (Joystik),                  ; Joystik (04h, application collection)

 *  Usage (Joystick),                 ; Joystick (04h, application collection)

 *  Collection (Application),

 *  Collection (Application),

 *    Collection (Logical),

 *    Collection (Logical),

 *      Report Size (8),

 *      Report Size (8),
@@ -207,7 +207,7 @@ static inline int drff_init(struct hid_device *hid) 
/* Fixed report descriptor for PID 0x011 joystick */

/* Fixed report descriptor for PID 0x011 joystick */

static __u8 pid0011_rdesc_fixed[] = {

static __u8 pid0011_rdesc_fixed[] = {

	0x05, 0x01,         /*  Usage Page (Desktop),           */

	0x05, 0x01,         /*  Usage Page (Desktop),           */

	0x09, 0x04,         /*  Usage (Joystik),                */

	0x09, 0x04,         /*  Usage (Joystick),               */

	0xA1, 0x01,         /*  Collection (Application),       */

	0xA1, 0x01,         /*  Collection (Application),       */

	0xA1, 0x02,         /*      Collection (Logical),       */

	0xA1, 0x02,         /*      Collection (Logical),       */

	0x14,               /*          Logical Minimum (0),    */

	0x14,               /*          Logical Minimum (0),    */