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

Commit fd62c545 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 

Pull HID subsystem updates from Jiri Kosina:

 1) Support for HID over I2C bus has been added by Benjamin Tissoires.
    ACPI device discovery is still in the works.

 2) Support for Win8 Multitiouch protocol is being added, most work done
    by Benjamin Tissoires as well

 3) EIO/ERESTARTSYS is fixed in hiddev/hidraw, fixes by Andrew Duggan
    and Jiri Kosina

 4) ION iCade driver added by Bastien Nocera

 5) Support for a couple new Roccat devices has been added by Stefan
    Achatz

 6) HID sensor hubs are now auto-detected instead of having to list all
    the VID/PID combinations in the blacklist array

 7) other random fixes and support for new device IDs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (65 commits)
  HID: i2c-hid: add mutex protecting open/close race
  Revert "HID: sensors: add to special driver list"
  HID: sensors: autodetect USB HID sensor hubs
  HID: hidp: fallback to input session properly if hid is blacklisted
  HID: i2c-hid: fix ret_count check
  HID: i2c-hid: fix i2c_hid_get_raw_report count mismatches
  HID: i2c-hid: remove extra .irq field in struct i2c_hid
  HID: i2c-hid: reorder allocation/free of buffers
  HID: i2c-hid: fix memory corruption due to missing hid declaration
  HID: i2c-hid: remove superfluous include
  HID: i2c-hid: remove unneeded test in i2c_hid_remove
  HID: i2c-hid: i2c_hid_get_report may fail
  HID: i2c-hid: also call i2c_hid_free_buffers in i2c_hid_remove
  HID: i2c-hid: fix error messages
  HID: i2c-hid: fix return paths
  HID: i2c-hid: remove unused static declarations
  HID: i2c-hid: fix i2c_hid_dbg macro
  HID: i2c-hid: fix checkpatch.pl warning
  HID: i2c-hid: enhance Kconfig
  HID: i2c-hid: change I2C name
  ...
parents a2013a13 818b930b

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus

+38 −0
Original line number Diff line number Diff line
@@ -8,3 +8,41 @@ Description: The integer value of this attribute ranges from 0-4. 
		When written, this file sets the number of the startup profile

		and the mouse activates this profile immediately.

		Please use actual_profile, it does the same thing.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/firmware_version

Date:		October 2010

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

Description:	When read, this file returns the raw integer version number of the

		firmware reported by the mouse. Using the integer value eases

		further usage in other programs. To receive the real version

		number the decimal point has to be shifted 2 positions to the

		left. E.g. a returned value of 121 means 1.21

		This file is readonly.

		Please read binary attribute info which contains firmware version.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_buttons

Date:		August 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds information about button layout.

		When read, these files return the respective profile buttons.

		The returned data is 77 bytes in size.

		This file is readonly.

		Write control to select profile and read profile_buttons instead.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/profile[1-5]_settings

Date:		August 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When read, these files return the respective profile settings.

		The returned data is 43 bytes in size.

		This file is readonly.

		Write control to select profile and read profile_settings instead.

Users:		http://roccat.sourceforge.net
 
 No newline at end of file

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus

0 → 100644
+66 −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>/kovaplus/roccatkovaplus<minor>/actual_cpi

Date:		January 2011

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

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

		When read, this attribute returns the number of the active

		cpi level.

		This file is readonly.

		Has never been used. If bookkeeping is done, it's done in userland tools.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/actual_sensitivity_x

Date:		January 2011

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

Description:	The integer value of this attribute ranges from 1-10.

		When read, this attribute returns the number of the actual

		sensitivity in x direction.

		This file is readonly.

		Has never been used. If bookkeeping is done, it's done in userland tools.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/actual_sensitivity_y

Date:		January 2011

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

Description:	The integer value of this attribute ranges from 1-10.

		When read, this attribute returns the number of the actual

		sensitivity in y direction.

		This file is readonly.

		Has never been used. If bookkeeping is done, it's done in userland tools.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/firmware_version

Date:		January 2011

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

Description:	When read, this file returns the raw integer version number of the

		firmware reported by the mouse. Using the integer value eases

		further usage in other programs. To receive the real version

		number the decimal point has to be shifted 2 positions to the

		left. E.g. a returned value of 121 means 1.21

		This file is readonly.

		Obsoleted by binary sysfs attribute "info".

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/profile[1-5]_buttons

Date:		January 2011

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds information about button layout.

		When read, these files return the respective profile buttons.

		The returned data is 23 bytes in size.

		This file is readonly.

		Write control to select profile and read profile_buttons instead.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/kovaplus/roccatkovaplus<minor>/profile[1-5]_settings

Date:		January 2011

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When read, these files return the respective profile settings.

		The returned data is 16 bytes in size.

		This file is readonly.

		Write control to select profile and read profile_settings instead.

Users:		http://roccat.sourceforge.net

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra

0 → 100644
+73 −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>/pyra/roccatpyra<minor>/actual_cpi

Date:		August 2010

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

Description:	It is possible to switch the cpi setting of the mouse with the

		press of a button.

		When read, this file returns the raw number of the actual cpi

		setting reported by the mouse. This number has to be further

		processed to receive the real dpi value.



		VALUE DPI

		1     400

		2     800

		4     1600



		This file is readonly.

		Has never been used. If bookkeeping is done, it's done in userland tools.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/actual_profile

Date:		August 2010

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

Description:	When read, this file returns the number of the actual profile in

		range 0-4.

		This file is readonly.

		Please use binary attribute "settings" which provides this information.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/firmware_version

Date:		August 2010

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

Description:	When read, this file returns the raw integer version number of the

		firmware reported by the mouse. Using the integer value eases

		further usage in other programs. To receive the real version

		number the decimal point has to be shifted 2 positions to the

		left. E.g. a returned value of 138 means 1.38

		This file is readonly.

		Please use binary attribute "info" which provides this information.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/profile[1-5]_buttons

Date:		August 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds information about button layout.

		When read, these files return the respective profile buttons.

		The returned data is 19 bytes in size.

		This file is readonly.

		Write control to select profile and read profile_buttons instead.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/profile[1-5]_settings

Date:		August 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When read, these files return the respective profile settings.

		The returned data is 13 bytes in size.

		This file is readonly.

		Write control to select profile and read profile_settings instead.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/pyra/roccatpyra<minor>/startup_profile

Date:		August 2010

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 profile

                that's active when the mouse is powered on.

		This file is readonly.

		Please use binary attribute "settings" which provides this information.

Users:		http://roccat.sourceforge.net

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

+8 −0
Original line number Diff line number Diff line
@@ -117,6 +117,14 @@ Description: When written, this file lets one store macros with max 500 
		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>/reset

Date:		November 2012

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

Description:	When written, this file lets one reset the device.

		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>/control

Date:		June 2011

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

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

+12 −36
Original line number Diff line number Diff line
@@ -9,15 +9,12 @@ Description: The integer value of this attribute ranges from 0-4. 
		and the mouse 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>/koneplus/roccatkoneplus<minor>/firmware_version

Date:		October 2010

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

Date:		November 2012

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

Description:	When read, this file returns the raw integer version number of the

		firmware reported by the mouse. Using the integer value eases

		further usage in other programs. To receive the real version

		number the decimal point has to be shifted 2 positions to the

		left. E.g. a returned value of 121 means 1.21

		This file is readonly.

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

		When written, the device can be reset.

		The data is 8 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>/koneplus/roccatkoneplus<minor>/macro
@@ -42,18 +39,8 @@ Description: The mouse can store 5 profiles which can be switched by the 
		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.

		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>/koneplus/roccatkoneplus<minor>/profile[1-5]_buttons

Date:		August 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_buttons holds information about button layout.

		When read, these files return the respective profile buttons.

		The returned data is 77 bytes in size.

		This file is readonly.

		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>/koneplus/roccatkoneplus<minor>/profile_settings
@@ -68,19 +55,8 @@ Description: The mouse can store 5 profiles which can be switched by the 
		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.

		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>/koneplus/roccatkoneplus<minor>/profile[1-5]_settings

Date:		August 2010

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

Description:	The mouse can store 5 profiles which can be switched by the

		press of a button. A profile is split in settings and buttons.

		profile_settings holds information like resolution, sensitivity

		and light effects.

		When read, these files return the respective profile settings.

		The returned data is 43 bytes in size.

		This file is readonly.

		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>/koneplus/roccatkoneplus<minor>/sensor
@@ -104,9 +80,9 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid- 
Date:		October 2010

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

Description:	When written a calibration process for the tracking control unit

		can be initiated/cancelled.

		The data has to be 3 bytes long.

		This file is writeonly.

		can be initiated/cancelled. Also lets one read/write sensor

		registers.

		The data has to be 4 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>/koneplus/roccatkoneplus<minor>/tcu_image