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

Commit 96e132eb authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower',... 

Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for-4.10/intel-ish', 'for-4.10/mayflash', 'for-4.10/microsoft-surface-3', 'for-4.10/multitouch', 'for-4.10/sony', 'for-4.10/udraw-ps3', 'for-4.10/upstream' and 'for-4.10/wacom/generic' into for-linus
parents 9ce12d8b 13c28b02 8cd16166 608ad184 f8690450 b897f6db 594312b8 de66a1a0 9c5dcd72 c60fa555 c9cfb2ac

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -12342,6 +12342,12 @@ S: Maintained 
F:	Documentation/filesystems/udf.txt

F:	fs/udf/



UDRAW TABLET

M:	Bastien Nocera <hadess@hadess.net>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-udraw.c



UFS FILESYSTEM

M:	Evgeniy Dushistov <dushistov@mail.ru>

S:	Maintained

drivers/hid/Kconfig

+16 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ config HID_CMEDIA 


config HID_CP2112

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

	depends on USB_HID && I2C && GPIOLIB

	depends on USB_HID && I2C && GPIOLIB && GPIOLIB_IRQCHIP

	---help---

	Support for Silicon Labs CP2112 HID USB to SMBus Master Bridge.

	This is a HID device driver which registers as an i2c adapter
@@ -512,6 +512,14 @@ config HID_MAGICMOUSE 
	Say Y here if you want support for the multi-touch features of the

	Apple Wireless "Magic" Mouse and the Apple Wireless "Magic" Trackpad.



config HID_MAYFLASH

	tristate "Mayflash game controller adapter force feedback"

	depends on HID

	select INPUT_FF_MEMLESS

	---help---

	Say Y here if you have HJZ Mayflash PS3 game controller adapters

	and want to enable force feedback support.



config HID_MICROSOFT

	tristate "Microsoft non-fully HID-compliant devices"

	depends on HID
@@ -861,6 +869,13 @@ config THRUSTMASTER_FF 
	  a THRUSTMASTER Dual Trigger 3-in-1 or a THRUSTMASTER Ferrari GT

	  Rumble Force or Force Feedback Wheel.



config HID_UDRAW_PS3

	tristate "THQ PS3 uDraw tablet"

	depends on HID

	---help---

	  Say Y here if you want to use the THQ uDraw gaming tablet for

	  the PS3.



config HID_WACOM

	tristate "Wacom Intuos/Graphire tablet support (USB)"

	depends on HID

drivers/hid/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o 
obj-$(CONFIG_HID_LOGITECH_DJ)	+= hid-logitech-dj.o

obj-$(CONFIG_HID_LOGITECH_HIDPP)	+= hid-logitech-hidpp.o

obj-$(CONFIG_HID_MAGICMOUSE)	+= hid-magicmouse.o

obj-$(CONFIG_HID_MAYFLASH)	+= hid-mf.o

obj-$(CONFIG_HID_MICROSOFT)	+= hid-microsoft.o

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o

obj-$(CONFIG_HID_MULTITOUCH)	+= hid-multitouch.o
@@ -96,6 +97,7 @@ obj-$(CONFIG_HID_TIVO) += hid-tivo.o 
obj-$(CONFIG_HID_TOPSEED)	+= hid-topseed.o

obj-$(CONFIG_HID_TWINHAN)	+= hid-twinhan.o

obj-$(CONFIG_HID_UCLOGIC)	+= hid-uclogic.o

obj-$(CONFIG_HID_UDRAW_PS3)	+= hid-udraw-ps3.o

obj-$(CONFIG_HID_LED)		+= hid-led.o

obj-$(CONFIG_HID_XINMO)		+= hid-xinmo.o

obj-$(CONFIG_HID_ZEROPLUS)	+= hid-zpff.o

drivers/hid/hid-core.c

+11 −2
Original line number Diff line number Diff line
@@ -727,8 +727,9 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) 
	    (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2 ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP ||

	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 ||

	     hid->product == USB_DEVICE_ID_MS_POWER_COVER) &&

	    hid->group == HID_GROUP_MULTITOUCH)

		hid->group = HID_GROUP_GENERIC;
@@ -1884,6 +1885,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DELCOM, USB_DEVICE_ID_DELCOM_VISUAL_IND) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },

#if IS_ENABLED(CONFIG_HID_MAYFLASH)

	{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },

#endif

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
@@ -1984,8 +1988,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) },
@@ -2060,6 +2065,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

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

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) },

	{ 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_SINO_LITE, USB_DEVICE_ID_SINO_LITE_CONTROLLER) },
@@ -2087,6 +2095,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_WP1062) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWHA60) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THQ, USB_DEVICE_ID_THQ_PS3_UDRAW) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_YIYNOVA_TABLET) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_81) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UGEE_TABLET_45) },

drivers/hid/hid-cp2112.c

+202 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 *   http://www.silabs.com/Support%20Documents/TechnicalDocs/AN495.pdf

 */



#include <linux/gpio.h>

#include <linux/gpio/driver.h>

#include <linux/hid.h>

#include <linux/i2c.h>
@@ -168,6 +169,12 @@ struct cp2112_device { 
	struct gpio_chip gc;

	u8 *in_out_buffer;

	spinlock_t lock;



	struct gpio_desc *desc[8];

	bool gpio_poll;

	struct delayed_work gpio_poll_worker;

	unsigned long irq_mask;

	u8 gpio_prev_state;

};



static int gpio_push_pull = 0xFF;
@@ -233,7 +240,7 @@ static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value) 
	spin_unlock_irqrestore(&dev->lock, flags);

}



static int cp2112_gpio_get(struct gpio_chip *chip, unsigned offset)

static int cp2112_gpio_get_all(struct gpio_chip *chip)

{

	struct cp2112_device *dev = gpiochip_get_data(chip);

	struct hid_device *hdev = dev->hdev;
@@ -252,7 +259,7 @@ static int cp2112_gpio_get(struct gpio_chip *chip, unsigned offset) 
		goto exit;

	}



	ret = (buf[1] >> offset) & 1;

	ret = buf[1];



exit:

	spin_unlock_irqrestore(&dev->lock, flags);
@@ -260,6 +267,17 @@ static int cp2112_gpio_get(struct gpio_chip *chip, unsigned offset) 
	return ret;

}



static int cp2112_gpio_get(struct gpio_chip *chip, unsigned int offset)

{

	int ret;



	ret = cp2112_gpio_get_all(chip);

	if (ret < 0)

		return ret;



	return (ret >> offset) & 1;

}



static int cp2112_gpio_direction_output(struct gpio_chip *chip,

					unsigned offset, int value)

{
@@ -1041,6 +1059,166 @@ static void chmod_sysfs_attrs(struct hid_device *hdev) 
	}

}



static void cp2112_gpio_irq_ack(struct irq_data *d)

{

}



static void cp2112_gpio_irq_mask(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct cp2112_device *dev = gpiochip_get_data(gc);



	__clear_bit(d->hwirq, &dev->irq_mask);

}



static void cp2112_gpio_irq_unmask(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct cp2112_device *dev = gpiochip_get_data(gc);



	__set_bit(d->hwirq, &dev->irq_mask);

}



static void cp2112_gpio_poll_callback(struct work_struct *work)

{

	struct cp2112_device *dev = container_of(work, struct cp2112_device,

						 gpio_poll_worker.work);

	struct irq_data *d;

	u8 gpio_mask;

	u8 virqs = (u8)dev->irq_mask;

	u32 irq_type;

	int irq, virq, ret;



	ret = cp2112_gpio_get_all(&dev->gc);

	if (ret == -ENODEV) /* the hardware has been disconnected */

		return;

	if (ret < 0)

		goto exit;



	gpio_mask = ret;



	while (virqs) {

		virq = ffs(virqs) - 1;

		virqs &= ~BIT(virq);



		if (!dev->gc.to_irq)

			break;



		irq = dev->gc.to_irq(&dev->gc, virq);



		d = irq_get_irq_data(irq);

		if (!d)

			continue;



		irq_type = irqd_get_trigger_type(d);



		if (gpio_mask & BIT(virq)) {

			/* Level High */



			if (irq_type & IRQ_TYPE_LEVEL_HIGH)

				handle_nested_irq(irq);



			if ((irq_type & IRQ_TYPE_EDGE_RISING) &&

			    !(dev->gpio_prev_state & BIT(virq)))

				handle_nested_irq(irq);

		} else {

			/* Level Low */



			if (irq_type & IRQ_TYPE_LEVEL_LOW)

				handle_nested_irq(irq);



			if ((irq_type & IRQ_TYPE_EDGE_FALLING) &&

			    (dev->gpio_prev_state & BIT(virq)))

				handle_nested_irq(irq);

		}

	}



	dev->gpio_prev_state = gpio_mask;



exit:

	if (dev->gpio_poll)

		schedule_delayed_work(&dev->gpio_poll_worker, 10);

}





static unsigned int cp2112_gpio_irq_startup(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct cp2112_device *dev = gpiochip_get_data(gc);



	INIT_DELAYED_WORK(&dev->gpio_poll_worker, cp2112_gpio_poll_callback);



	cp2112_gpio_direction_input(gc, d->hwirq);



	if (!dev->gpio_poll) {

		dev->gpio_poll = true;

		schedule_delayed_work(&dev->gpio_poll_worker, 0);

	}



	cp2112_gpio_irq_unmask(d);

	return 0;

}



static void cp2112_gpio_irq_shutdown(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct cp2112_device *dev = gpiochip_get_data(gc);



	cancel_delayed_work_sync(&dev->gpio_poll_worker);

}



static int cp2112_gpio_irq_type(struct irq_data *d, unsigned int type)

{

	return 0;

}



static struct irq_chip cp2112_gpio_irqchip = {

	.name = "cp2112-gpio",

	.irq_startup = cp2112_gpio_irq_startup,

	.irq_shutdown = cp2112_gpio_irq_shutdown,

	.irq_ack = cp2112_gpio_irq_ack,

	.irq_mask = cp2112_gpio_irq_mask,

	.irq_unmask = cp2112_gpio_irq_unmask,

	.irq_set_type = cp2112_gpio_irq_type,

};



static int __maybe_unused cp2112_allocate_irq(struct cp2112_device *dev,

					      int pin)

{

	int ret;



	if (dev->desc[pin])

		return -EINVAL;



	dev->desc[pin] = gpiochip_request_own_desc(&dev->gc, pin,

						   "HID/I2C:Event");

	if (IS_ERR(dev->desc[pin])) {

		dev_err(dev->gc.parent, "Failed to request GPIO\n");

		return PTR_ERR(dev->desc[pin]);

	}



	ret = gpiochip_lock_as_irq(&dev->gc, pin);

	if (ret) {

		dev_err(dev->gc.parent, "Failed to lock GPIO as interrupt\n");

		goto err_desc;

	}



	ret = gpiod_to_irq(dev->desc[pin]);

	if (ret < 0) {

		dev_err(dev->gc.parent, "Failed to translate GPIO to IRQ\n");

		goto err_lock;

	}



	return ret;



err_lock:

	gpiochip_unlock_as_irq(&dev->gc, pin);

err_desc:

	gpiochip_free_own_desc(dev->desc[pin]);

	dev->desc[pin] = NULL;

	return ret;

}



static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)

{

	struct cp2112_device *dev;
@@ -1163,8 +1341,17 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	chmod_sysfs_attrs(hdev);

	hid_hw_power(hdev, PM_HINT_NORMAL);



	ret = gpiochip_irqchip_add(&dev->gc, &cp2112_gpio_irqchip, 0,

				   handle_simple_irq, IRQ_TYPE_NONE);

	if (ret) {

		dev_err(dev->gc.parent, "failed to add IRQ chip\n");

		goto err_sysfs_remove;

	}



	return ret;



err_sysfs_remove:

	sysfs_remove_group(&hdev->dev.kobj, &cp2112_attr_group);

err_gpiochip_remove:

	gpiochip_remove(&dev->gc);

err_free_i2c:
@@ -1181,10 +1368,22 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id) 
static void cp2112_remove(struct hid_device *hdev)

{

	struct cp2112_device *dev = hid_get_drvdata(hdev);

	int i;



	sysfs_remove_group(&hdev->dev.kobj, &cp2112_attr_group);

	gpiochip_remove(&dev->gc);

	i2c_del_adapter(&dev->adap);



	if (dev->gpio_poll) {

		dev->gpio_poll = false;

		cancel_delayed_work_sync(&dev->gpio_poll_worker);

	}



	for (i = 0; i < ARRAY_SIZE(dev->desc); i++) {

		gpiochip_unlock_as_irq(&dev->gc, i);

		gpiochip_free_own_desc(dev->desc[i]);

	}



	gpiochip_remove(&dev->gc);

	/* i2c_del_adapter has finished removing all i2c devices from our

	 * adapter. Well behaved devices should no longer call our cp2112_xfer

	 * and should have waited for any pending calls to finish. It has also