Commit 929bd380 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes'... 

Merge branches 'hidraw', 'magicmouse', 'multitouch', 'roccat', 'suspend-fixes' and 'upstream' into for-linus
parents b94e3c94 a6d1bc1d 82d06982 11a5c818 eb055fd0 2d8767bb

Documentation/ABI/testing/sysfs-driver-hid-lenovo-tpkbd

0 → 100644
+38 −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>/press_to_select

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This controls if mouse clicks should be generated if the trackpoint is quickly pressed. How fast this press has to be

		is being controlled by press_speed.

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	If this setting is enabled, it is possible to do dragging by pressing the trackpoint. This requires press_to_select to be enabled.

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	For details regarding this setting please refer to http://www.pc.ibm.com/ww/healthycomputing/trkpntb.html

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This setting controls if the mouse click events generated by pressing the trackpoint (if press_to_select is enabled) generate

		a left or right mouse button click.

		Values are 0 or 1.



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This file contains the trackpoint sensitivity.

		Values are decimal integers from 1 (lowest sensitivity) to 255 (highest sensitivity).



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

Date:		July 2011

Contact:	linux-input@vger.kernel.org

Description:	This setting controls how fast the trackpoint needs to be pressed to generate a mouse click if press_to_select is enabled.

		Values are decimal integers from 1 (slowest) to 255 (fastest).

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

0 → 100644
+77 −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>/savu/roccatsavu<minor>/buttons

Date:		Mai 2012

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 into general settings and

		button settings. buttons holds informations about button layout.

		When written, this file lets one write the respective profile

		buttons to the mouse. The data has to be 47 bytes long.

		The mouse will reject invalid data.

		Which profile to write is determined by the profile number

		contained in the data.

		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>/savu/roccatsavu<minor>/control

Date:		Mai 2012

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>/savu/roccatsavu<minor>/general

Date:		Mai 2012

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 into general settings and

		button settings. profile holds informations like resolution, sensitivity

		and light effects.

		When written, this file lets one write the respective profile

		settings back to the mouse. The data has to be 43 bytes long.

		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>/savu/roccatsavu<minor>/info

Date:		Mai 2012

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

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

		The data is 8 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>/savu/roccatsavu<minor>/macro

Date:		Mai 2012

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>/savu/roccatsavu<minor>/profile

Date:		Mai 2012

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. profile holds number of actual profile.

		This value is persistent, so its value determines the profile

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

		When written, the mouse activates the set profile immediately.

		The data has to be 3 bytes long.

		The mouse will reject invalid data.

Users:		http://roccat.sourceforge.net



What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/savu/roccatsavu<minor>/sensor

Date:		July 2012

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

Description:	The mouse has a Avago ADNS-3090 sensor.

		This file allows reading and writing of the mouse sensors registers.

		The data has to be 4 bytes long.

Users:		http://roccat.sourceforge.net

drivers/hid/Kconfig

+17 −2
Original line number Diff line number Diff line
@@ -193,10 +193,12 @@ config HID_EZKEY 
	Support for Ezkey BTC 8193 keyboard.



config HID_HOLTEK

	tristate "Holtek On Line Grip based game controller support"

	tristate "Holtek HID devices"

	depends on USB_HID

	---help---

	  Say Y here if you have a Holtek On Line Grip based game controller.

	Support for Holtek based devices:

	  - Holtek On Line Grip based game controller

	  - Trust GXT 18 Gaming Keyboard



config HOLTEK_FF

	bool "Holtek On Line Grip force feedback support"
@@ -261,6 +263,19 @@ config HID_LCPOWER 
	---help---

	Support for LC-Power RC1000MCE RF remote control.



config HID_LENOVO_TPKBD

	tristate "Lenovo ThinkPad USB Keyboard with TrackPoint"

	depends on USB_HID

	select NEW_LEDS

	select LEDS_CLASS

	---help---

	Support for the Lenovo ThinkPad USB Keyboard with TrackPoint.



	Say Y here if you have a Lenovo ThinkPad USB Keyboard with TrackPoint

	and would like to use device-specific features like changing the

	sensitivity of the trackpoint, using the microphone mute button or

	controlling the mute and microphone mute LEDs.



config HID_LOGITECH

	tristate "Logitech devices" if EXPERT

	depends on USB_HID

drivers/hid/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -48,12 +48,14 @@ obj-$(CONFIG_HID_EMS_FF) += hid-emsff.o 
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-holtek-kbd.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

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

obj-$(CONFIG_HID_LENOVO_TPKBD)	+= hid-lenovo-tpkbd.o

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

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

obj-$(CONFIG_HID_MAGICMOUSE)    += hid-magicmouse.o
@@ -69,7 +71,8 @@ obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o 
obj-$(CONFIG_HID_PRIMAX)	+= hid-primax.o

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

	hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \

	hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o

	hid-roccat-koneplus.o hid-roccat-kovaplus.o hid-roccat-pyra.o \

	hid-roccat-savu.o

obj-$(CONFIG_HID_SAITEK)	+= hid-saitek.o

obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o

obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o

drivers/hid/hid-chicony.c

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
static const struct hid_device_id ch_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },

	{ }

};

MODULE_DEVICE_TABLE(hid, ch_devices);