Commit 9fa40a11 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 updates from Jiri Kosina:

 1) Patchset from Henrik Rydberg which substantially reduces irqsoff
    latency for all input devices.  In addition to that, Henrik reworked
    multitouch handling in order to reduce runtime memory consumption.

    This patchset touches code in Input subsystem as well.  All the
    changes have been Acked by Dmitry, and we agreed to do it this way
    due to inter-dependencies between the patchset and subsequent
    changes in HID subsystem.

 2) Rework, clenaups and a lot of fixes to picolcd driver by Bruno
    Prémont.

 3) Core report descriptor handling fix which fixes resume issue on some
    devices, by Kevin Daughtridge

 4) hidraw fixes by Alexey Khoroshilov and Ratan Nalumasu

 5) wiimote driver now supports balance board, by David Herrmann.

 6) Other smaller fixes and new device id additions all over the place.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (79 commits)
  HID: hidraw: don't deallocate memory when it is in use
  HID: picoLCD: optimize for inactive debugfs
  HID: multitouch: add support for GeneralTouch multi-touchscreen
  HID: Add support for Sony PS3 BD Remote Control
  HID: keep dev_rdesc unmodified and use it for comparisons
  HID: lg4ff: Minor coding style fixes in lg4ff and hid-lg
  HID: hid-lg4ff: Set absolute axes parametes on DFP
  HID: hid-lg4ff: Adjust X axis input value accordingly to selected range.
  HID: hid-lg4ff: Minor code cleanup to improve readability
  HID: ntrig: change default value of logical/physical width/height to 1
  HID: picoLCD: bounds check in dump_buff_as_hex()
  Input: bcm5974 - Convert to MT-B
  Input: bcm5974 - Drop the logical dimensions
  Input: bcm5974 - Preparatory renames
  Input: bcm5974 - only setup button urb for TYPE1 devices
  HID: hid-multitouch: Add Flatfrog support
  HID: hid-multitouch: Fix contact count on 3M panels
  HID: hid-multitouch: Remove the redundant touch state
  HID: hid-multitouch: Simplify setup and frame synchronization
  HID: Allow more fields in the hid report
  ...
parents 99dbb163 cdcd3ac4

Documentation/ABI/testing/sysfs-driver-wacom

+13 −0
Original line number Diff line number Diff line 
WWhat:		/sys/class/hidraw/hidraw*/device/oled*_img

Date:		June 2012

Contact:	linux-bluetooth@vger.kernel.org

Description:

		The /sys/class/hidraw/hidraw*/device/oled*_img files control

		OLED mocro displays on Intuos4 Wireless tablet. Accepted image

		has to contain 256 bytes (64x32 px 1 bit colour). The format

		is the same as PBM image 62x32px without header (64 bits per

		horizontal line, 32 lines). An example of setting OLED No. 0:

		dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img

		The attribute is read only and no local copy of the image is

		stored.



What:		/sys/class/hidraw/hidraw*/device/speed

Date:		April 2010

Kernel Version:	2.6.35

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -5322,6 +5322,12 @@ L: linux-mtd@lists.infradead.org 
S:	Maintained

F:	drivers/mtd/devices/phram.c



PICOLCD HID DRIVER

M:	Bruno Prémont <bonbons@linux-vserver.org>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-picolcd*



PICOXCELL SUPPORT

M:	Jamie Iles <jamie@jamieiles.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

drivers/hid/Kconfig

+20 −2
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ config HID_LOGITECH 
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
@@ -527,6 +526,14 @@ config HID_PICOLCD_LEDS 
	---help---

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



config HID_PICOLCD_CIR

	bool "CIR via RC class" if EXPERT

	default !EXPERT

	depends on HID_PICOLCD

	depends on HID_PICOLCD=RC_CORE || RC_CORE=y

	---help---

	  Provide access to PicoLCD's CIR interface via remote control (LIRC).



config HID_PRIMAX

	tristate "Primax non-fully HID-compliant devices"

	depends on USB_HID
@@ -534,6 +541,15 @@ config HID_PRIMAX 
	Support for Primax devices that are not fully compliant with the

	HID standard.



config HID_PS3REMOTE

	tristate "Sony PS3 BD Remote Control"

	depends on BT_HIDP

	---help---

	Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech

	Harmony Adapter for PS3, which connect over Bluetooth.



	Support for the 6-axis controllers is provided by HID_SONY.



config HID_ROCCAT

	tristate "Roccat device support"

	depends on USB_HID
@@ -561,7 +577,9 @@ config HID_SONY 
	tristate "Sony PS3 controller"

	depends on USB_HID

	---help---

	Support for Sony PS3 controller.

	Support for Sony PS3 6-axis controllers.



	Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.



config HID_SPEEDLINK

	tristate "Speedlink VAD Cezanne mouse support"

drivers/hid/Makefile

+21 −0
Original line number Diff line number Diff line
@@ -69,7 +69,28 @@ obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o 
obj-$(CONFIG_HID_PANTHERLORD)	+= hid-pl.o

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

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

hid-picolcd-y			+= hid-picolcd_core.o

ifdef CONFIG_HID_PICOLCD_FB

hid-picolcd-y			+= hid-picolcd_fb.o

endif

ifdef CONFIG_HID_PICOLCD_BACKLIGHT

hid-picolcd-y			+= hid-picolcd_backlight.o

endif

ifdef CONFIG_HID_PICOLCD_LCD

hid-picolcd-y			+= hid-picolcd_lcd.o

endif

ifdef CONFIG_HID_PICOLCD_LEDS

hid-picolcd-y			+= hid-picolcd_leds.o

endif

ifdef CONFIG_HID_PICOLCD_CIR

hid-picolcd-y			+= hid-picolcd_cir.o

endif

ifdef CONFIG_DEBUG_FS

hid-picolcd-y			+= hid-picolcd_debugfs.o

endif



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

obj-$(CONFIG_HID_PS3REMOTE)	+= hid-ps3remote.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 \

drivers/hid/hid-a4tech.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2007 Jiri Kosina

 *  Copyright (c) 2007 Paul Walmsley

 *  Copyright (c) 2008 Jiri Slaby

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE