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

Commit 31dced41 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (61 commits)
  HID: hid-magicmouse: Magic Trackpad has 1 button, not 2
  HID: Add device IDs for more SJOY adapters
  HID: primax: remove spurious dependency
  HID: support primax keyboards violating USB HID spec
  HID: usbhid: cancel timer for retry synchronously
  HID: wacom: Set input bits before registration
  HID: consolidate MacbookAir 4,1 mappings
  HID: MacbookAir4,1 and MacbookAir4,2 need entry in hid_mouse_ignore_list[]
  HID: Add support MacbookAir 4,1 keyboard
  HID: hidraw: open count should not increase if error
  HID: hiddev: potential info leak in hiddev_ioctl()
  HID: multitouch: decide if hid-multitouch needs to handle mt devices
  HID: add autodetection of multitouch devices
  HID: "hid-logitech" driver with Logitech Driving Force GT
  HID: hid-logitech-dj: fix off by one
  HID: hidraw: protect hidraw_disconnect() better
  HID: hid-multitouch: add support for the IDEACOM 6650 chip
  HID: Add full support for Logitech Unifying receivers
  HID: hidraw: free list for all error in hidraw_open
  HID: roccat: Kone now reports external profile changes via roccat device
  ...
parents 7c1953dd b3aec7b6

Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.

Date:		July 2011

KernelVersion:	3.2

Contact:	Michal Malý <madcatxster@gmail.com>

Description:	Display minimum, maximum and current range of the steering

		wheel. Writing a value within min and max boundaries sets the

		range of the wheel.

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7147,6 +7147,12 @@ L: linux-scsi@vger.kernel.org 
S:	Maintained

F:	drivers/scsi/wd7000.c



WIIMOTE HID DRIVER

M:	David Herrmann <dh.herrmann@googlemail.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-wiimote*



WINBOND CIR DRIVER

M:	David Härdeman <david@hardeman.nu>

S:	Maintained

drivers/hid/Kconfig

+36 −6
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config HID_ACRUX 
	Say Y here if you want to enable support for ACRUX game controllers.



config HID_ACRUX_FF

	tristate "ACRUX force feedback support"

	bool "ACRUX force feedback support"

	depends on HID_ACRUX

	select INPUT_FF_MEMLESS

	---help---
@@ -245,6 +245,15 @@ config HID_LOGITECH 
	---help---

	Support for Logitech devices that are not fully compliant with HID standard.



config HID_LOGITECH_DJ

	tristate "Logitech Unifying receivers full support"

	depends on HID_LOGITECH

	default m

	---help---

	Say Y if you want support for Logitech Unifying receivers and devices.

	Unifying receivers are capable of pairing up to 6 Logitech compliant

	devices to the same receiver.



config LOGITECH_FF

	bool "Logitech force feedback support"

	depends on HID_LOGITECH
@@ -278,13 +287,21 @@ config LOGIG940_FF 
	  Say Y here if you want to enable force feedback support for Logitech

	  Flight System G940 devices.



config LOGIWII_FF

	bool "Logitech Speed Force Wireless force feedback support"

config LOGIWHEELS_FF

	bool "Logitech wheels configuration and force feedback support"

	depends on HID_LOGITECH

	select INPUT_FF_MEMLESS

	default LOGITECH_FF

	help

	  Say Y here if you want to enable force feedback support for Logitech

	  Speed Force Wireless (Wii) devices.

	  Say Y here if you want to enable force feedback and range setting

	  support for following Logitech wheels:

	  - Logitech Driving Force

	  - Logitech Driving Force Pro

	  - Logitech Driving Force GT

	  - Logitech G25

	  - Logitech G27

	  - Logitech MOMO/MOMO 2

	  - Logitech Formula Force EX



config HID_MAGICMOUSE

	tristate "Apple MagicMouse multi-touch support"
@@ -328,6 +345,7 @@ config HID_MULTITOUCH 
	  - Hanvon dual touch panels

	  - Ilitek dual touch panels

	  - IrTouch Infrared USB panels

	  - LG Display panels (Dell ST2220Tc)

	  - Lumio CrystalTouch panels

	  - MosArt dual-touch panels

	  - PenMount dual touch panels
@@ -441,6 +459,13 @@ config HID_PICOLCD_LEDS 
	---help---

	  Provide access to PicoLCD's GPO pins via leds class.



config HID_PRIMAX

	tristate "Primax non-fully HID-compliant devices"

	depends on USB_HID

	---help---

	Support for Primax devices that are not fully compliant with the

	HID standard.



config HID_QUANTA

	tristate "Quanta Optical Touch panels"

	depends on USB_HID
@@ -539,7 +564,11 @@ config HID_SMARTJOYPLUS 
	tristate "SmartJoy PLUS PS2/USB adapter support"

	depends on USB_HID

	---help---

	Support for SmartJoy PLUS PS2/USB adapter.

	Support for SmartJoy PLUS PS2/USB adapter, Super Dual Box,

	Super Joy Box 3 Pro, Super Dual Box Pro, and Super Joy Box 5 Pro.



	Note that DDR (Dance Dance Revolution) mode is not supported, nor

	is pressure sensitive buttons on the pro models.



config SMARTJOYPLUS_FF

	bool "SmartJoy PLUS PS2/USB adapter force feedback support"
@@ -590,6 +619,7 @@ config HID_WIIMOTE 
	tristate "Nintendo Wii Remote support"

	depends on BT_HIDP

	depends on LEDS_CLASS

	select POWER_SUPPLY

	---help---

	Support for the Nintendo Wii Remote bluetooth device.

drivers/hid/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ endif 
ifdef CONFIG_LOGIG940_FF

	hid-logitech-y	+= hid-lg3ff.o

endif

ifdef CONFIG_LOGIWII_FF

ifdef CONFIG_LOGIWHEELS_FF

	hid-logitech-y	+= hid-lg4ff.o

endif
@@ -43,6 +43,7 @@ obj-$(CONFIG_HID_KEYTOUCH) += hid-keytouch.o 
obj-$(CONFIG_HID_KYE)		+= hid-kye.o

obj-$(CONFIG_HID_LCPOWER)       += hid-lcpower.o

obj-$(CONFIG_HID_LOGITECH)	+= hid-logitech.o

obj-$(CONFIG_HID_LOGITECH_DJ)	+= hid-logitech-dj.o

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

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

obj-$(CONFIG_HID_MONTEREY)	+= hid-monterey.o
@@ -54,6 +55,7 @@ obj-$(CONFIG_HID_QUANTA) += hid-quanta.o 
obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o

obj-$(CONFIG_HID_PETALYNX)	+= hid-petalynx.o

obj-$(CONFIG_HID_PICOLCD)	+= hid-picolcd.o

obj-$(CONFIG_HID_PRIMAX)	+= hid-primax.o

obj-$(CONFIG_HID_ROCCAT)	+= hid-roccat.o

obj-$(CONFIG_HID_ROCCAT_COMMON)	+= hid-roccat-common.o

obj-$(CONFIG_HID_ROCCAT_ARVO)	+= hid-roccat-arvo.o

drivers/hid/hid-apple.c

+15 −0
Original line number Diff line number Diff line
@@ -183,6 +183,9 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&

				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)

			table = macbookair_fn_keys;

		else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI &&

				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS)

			table = macbookair_fn_keys;

		else if (hid->product < 0x21d || hid->product >= 0x300)

			table = powerbook_fn_keys;

		else
@@ -493,6 +496,18 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),