Commit f62f6191 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: (68 commits)
  hid-input/battery: add FEATURE quirk
  hid-input/battery: remove battery_val
  hid-input/battery: power-supply type really *is* a battery
  hid-input/battery: make the battery setup common for INPUTs and FEATUREs
  hid-input/battery: deal with both FEATURE and INPUT report batteries
  hid-input/battery: add quirks for battery
  hid-input/battery: remove apparently redundant kmalloc
  hid-input: add support for HID devices reporting Battery Strength
  HID: hid-multitouch: add support 9 new Xiroku devices
  HID: multitouch: add support for 3M 32"
  HID: multitouch: add support of Atmel multitouch panels
  HID: usbhid: defer LED setting to a workqueue
  HID: usbhid: hid-core: submit queued urbs before suspend
  HID: usbhid: remove LED_ON
  HID: emsff: use symbolic name instead of hardcoded PID constant
  HID: Enable HID_QUIRK_MULTI_INPUT for Trio Linker Plus II
  HID: Kconfig: fix syntax
  HID: introduce proper dependency of HID_BATTERY on POWER_SUPPLY
  HID: multitouch: support PixArt optical touch screen
  HID: make parser more verbose about parsing errors by default
  ...

Fix up rename/delete conflict in drivers/hid/hid-hyperv.c (removed in
staging, moved in this branch) and similarly for the rules for same file
in drivers/staging/hv/{Kconfig,Makefile}.
parents d04baa15 420174af

Documentation/ABI/testing/sysfs-driver-hid-multitouch

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/quirks

Date:		November 2011

Contact:	Benjamin Tissoires <benjamin.tissoires@gmail.com>

Description:	The integer value of this attribute corresponds to the

		quirks actually in place to handle the device's protocol.

		When read, this attribute returns the current settings (see

		MT_QUIRKS_* in hid-multitouch.c).

		When written this attribute change on the fly the quirks, then

		the protocol to handle the device.

Documentation/ABI/testing/sysfs-driver-hid-roccat-isku

0 → 100644
+135 −0
Original line number Diff line number Diff line 
What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/actual_profile

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	The integer value of this attribute ranges from 0-4.

		When read, this attribute returns the number of the actual

		profile. This value is persistent, so its equivalent to the

		profile that's active when the device is powered on next time.

		When written, this file sets the number of the startup profile

		and the device activates this profile immediately.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/info

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When read, this file returns general data like firmware version.

		The data is 6 bytes long.

		This file is readonly.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/key_mask

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one deactivate certain keys like

		windows and application keys, to prevent accidental presses.

		Profile number for which this settings occur is included in

		written data. The data has to be 6 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_capslock

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the function of the

		capslock key for a specific profile. Profile number is included

		in written data. The data has to be 6 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_easyzone

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the function of the

		easyzone keys for a specific profile. Profile number is included

		in written data. The data has to be 65 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_function

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the function of the

		function keys for a specific profile. Profile number is included

		in written data. The data has to be 41 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_macro

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the function of the macro

		keys for a specific profile. Profile number is included in

		written data. The data has to be 35 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_media

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the function of the media

		keys for a specific profile. Profile number is included in

		written data. The data has to be 29 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/keys_thumbster

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the function of the

		thumbster keys for a specific profile. Profile number is included

		in written data. The data has to be 23 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/last_set

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the time in secs since

		epoch in which the last configuration took place.

		The data has to be 20 bytes long.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/light

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one set the backlight intensity for

		a specific profile. Profile number is included in written data.

		The data has to be 10 bytes long.

		Before reading this file, control has to be written to select

		which profile to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/macro

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one store macros with max 500

		keystrokes for a specific button for a specific profile.

		Button and profile numbers are included in written data.

		The data has to be 2083 bytes long.

		Before reading this file, control has to be written to select

		which profile and key to read.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/control

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one select which data from which

		profile will be	read next. The data has to be 3 bytes long.

		This file is writeonly.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/isku/roccatisku<minor>/talk

Date:		June 2011

Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>

Description:	When written, this file lets one trigger easyshift functionality

		from the host.

		The data has to be 16 bytes long.

		This file is writeonly.

Users:		http://roccat.sourceforge.net

Documentation/ABI/testing/sysfs-driver-hid-wiimote

+12 −0
Original line number Diff line number Diff line
@@ -8,3 +8,15 @@ Contact: David Herrmann <dh.herrmann@googlemail.com> 
Description:	Make it possible to set/get current led state. Reading from it

		returns 0 if led is off and 1 if it is on. Writing 0 to it

		disables the led, writing 1 enables it.



What:		/sys/bus/hid/drivers/wiimote/<dev>/extension

Date:		August 2011

KernelVersion:	3.2

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

Description:	This file contains the currently connected and initialized

		extensions. It can be one of: none, motionp, nunchuck, classic,

		motionp+nunchuck, motionp+classic

		motionp is the official Nintendo Motion+ extension, nunchuck is

		the official Nintendo Nunchuck extension and classic is the

		Nintendo Classic Controller extension. The motionp extension can

		be combined with the other two.

drivers/hid/Kconfig

+32 −6
Original line number Diff line number Diff line
@@ -31,6 +31,11 @@ config HID 


	  If unsure, say Y.



config HID_BATTERY_STRENGTH

	bool

	depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY

	default y



config HIDRAW

	bool "/dev/hidraw raw HID device support"

	depends on HID
@@ -335,6 +340,7 @@ config HID_MULTITOUCH 
	  Say Y here if you have one of the following devices:

	  - 3M PCT touch screens

	  - ActionStar dual touch panels

	  - Atmel panels

	  - Cando dual touch panels

	  - Chunghwa panels

	  - CVTouch panels
@@ -349,12 +355,15 @@ config HID_MULTITOUCH 
	  - Lumio CrystalTouch panels

	  - MosArt dual-touch panels

	  - PenMount dual touch panels

	  - PixArt optical touch screen

	  - Pixcir dual touch panels

	  - Quanta panels

	  - eGalax dual-touch panels, including the Joojoo and Wetab tablets

	  - Stantum multitouch panels

	  - Touch International Panels

	  - Unitec Panels

	  - XAT optical touch panels

	  - Xiroku optical touch panels



	  If unsure, say N.
@@ -466,12 +475,6 @@ config HID_PRIMAX 
	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

	---help---

	Support for Quanta Optical Touch dual-touch panels.



config HID_ROCCAT

	tristate "Roccat special event support"

	depends on USB_HID
@@ -492,6 +495,13 @@ config HID_ROCCAT_ARVO 
	---help---

	Support for Roccat Arvo keyboard.



config HID_ROCCAT_ISKU

	tristate "Roccat Isku keyboard support"

	depends on USB_HID

	depends on HID_ROCCAT

	---help---

	Support for Roccat Isku keyboard.



config HID_ROCCAT_KONE

	tristate "Roccat Kone Mouse support"

	depends on USB_HID
@@ -560,6 +570,12 @@ config GREENASIA_FF 
	(like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter

	and want to enable force feedback support for it.



config HID_HYPERV_MOUSE

	tristate "Microsoft Hyper-V mouse driver"

	depends on HYPERV

	---help---

	Select this option to enable the Hyper-V mouse driver.



config HID_SMARTJOYPLUS

	tristate "SmartJoy PLUS PS2/USB adapter support"

	depends on USB_HID
@@ -620,9 +636,19 @@ config HID_WIIMOTE 
	depends on BT_HIDP

	depends on LEDS_CLASS

	select POWER_SUPPLY

	select INPUT_FF_MEMLESS

	---help---

	Support for the Nintendo Wii Remote bluetooth device.



config HID_WIIMOTE_EXT

	bool "Nintendo Wii Remote Extension support"

	depends on HID_WIIMOTE

	default HID_WIIMOTE

	---help---

	Support for extension controllers of the Nintendo Wii Remote. Say yes

	here if you want to use the Nintendo Motion+, Nunchuck or Classic

	extension controllers with your Wii Remote.



config HID_ZEROPLUS

	tristate "Zeroplus based game controller support"

	depends on USB_HID

drivers/hid/Makefile

+10 −1
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@ ifdef CONFIG_LOGIWHEELS_FF 
	hid-logitech-y	+= hid-lg4ff.o

endif



hid-wiimote-y		:= hid-wiimote-core.o

ifdef CONFIG_HID_WIIMOTE_EXT

	hid-wiimote-y	+= hid-wiimote-ext.o

endif

ifdef CONFIG_DEBUG_FS

	hid-wiimote-y	+= hid-wiimote-debug.o

endif



obj-$(CONFIG_HID_A4TECH)	+= hid-a4tech.o

obj-$(CONFIG_HID_ACRUX)		+= hid-axff.o

obj-$(CONFIG_HID_APPLE)		+= hid-apple.o
@@ -38,6 +46,7 @@ obj-$(CONFIG_HID_ELECOM) += hid-elecom.o 
obj-$(CONFIG_HID_EZKEY)		+= hid-ezkey.o

obj-$(CONFIG_HID_GYRATION)	+= hid-gyration.o

obj-$(CONFIG_HID_HOLTEK)	+= hid-holtekff.o

obj-$(CONFIG_HID_HYPERV_MOUSE)	+= hid-hyperv.o

obj-$(CONFIG_HID_KENSINGTON)	+= hid-kensington.o

obj-$(CONFIG_HID_KEYTOUCH)	+= hid-keytouch.o

obj-$(CONFIG_HID_KYE)		+= hid-kye.o
@@ -51,7 +60,6 @@ obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o 
obj-$(CONFIG_HID_NTRIG)		+= hid-ntrig.o

obj-$(CONFIG_HID_ORTEK)		+= hid-ortek.o

obj-$(CONFIG_HID_PRODIKEYS)	+= hid-prodikeys.o

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
@@ -59,6 +67,7 @@ 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

obj-$(CONFIG_HID_ROCCAT_ISKU)	+= hid-roccat-isku.o

obj-$(CONFIG_HID_ROCCAT_KONE)	+= hid-roccat-kone.o

obj-$(CONFIG_HID_ROCCAT_KONEPLUS)	+= hid-roccat-koneplus.o

obj-$(CONFIG_HID_ROCCAT_KOVAPLUS)	+= hid-roccat-kovaplus.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE