02 Oct, 2012
1 commit
-
Pull staging tree update from Greg Kroah-Hartman:
"Here is the big staging tree update for the 3.7-rc1 merge window.There are a few patches in here that are outside of the staging area,
namely HID and IIO patches, but all of them have been acked by the
relevant subsystem maintainers. The IIO stuff is still coming in
through this tree as it hasn't entirely moved out of the staging tree,
but is almost there.Other than that, there wa a ton of work on the comedi drivers to make
them more readable and the correct style. Doing that removed a lot of
code, but we added a new driver to the staging tree, so we didn't end
up with a net reduction this time around:662 files changed, 51649 insertions(+), 26582 deletions(-)
All of these patches have been in the linux-next tree already.
Signed-off-by: Greg Kroah-Hartman "
* tag 'staging-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1094 commits)
staging: comedi: jr3_pci: fix iomem dereference
staging: comedi: drivers: use comedi_fc.h cmdtest helpers
Staging: winbond: usb_free_urb(NULL) is safe
Staging: winbond: checkpatch cleanup
Staging: winbond: Removed undesired spaces, lines and tabs
Staging: winbond: Typo corrections in comments
Staging: winbond: Changed c99 comments to c89 comments
staging: r8712u: Do not queue cloned skb
staging: comedi: ni_mio_common: always lock in ni_ai_poll()
staging: comedi: s626: add FIXME comment
staging: comedi: s626: don't dereference insn->data
staging: comedi: s526: fix if() check in s526_gpct_winsn()
staging: comedi: s626: cleanup comments in s626_initialize()
staging: comedi: s626: remove clear of kzalloc'ed data
staging: comedi: s626: remove 'WDInterval' from private data
staging: comedi: s626: remove 'ChargeEnabled' from private data
staging: comedi: s626: remove 'IsBoardRevA' comment
staging: comedi: s626: #if 0 out the "SAA7146 BUG WORKAROUND"
staging: comedi: s626: remove 'allocatedBuf' from private data
staging: comedi: s626: add final attach message
...
01 Oct, 2012
3 commits
-
Conflicts:
drivers/hid/usbhid/hid-quirks.c -
… 'wacom' and 'wiimote' into for-linus
-
The Sony PS3 Blue-ray Disc Remote Control used to be supported by the
BlueZ project's user space, but the code that handled it was recently
removed as its functionality conflicted with a real HSP implementation
and the mapping was thought to be better handled in the kernel. This is
a port of the mapping logic from the fakehid driver by Marcel Holtmann
to the in-kernel HID layer.We also add support for the Logitech Harmony Adapter for PS3, which
emulates the BD Remote.Signed-off-by: David Dillow
Signed-off-by: Antonio Ospite
Signed-off-by: Jiri Kosina
07 Sep, 2012
1 commit
-
Adding processing for HID Sensor usage table as defined by
HID 1.12, Request #: HUTRR39, dated 05 May, 2011.
This driver uses HID driver framework to register, send and
receive events.
This uses MFD framework, so that actual processing for a
specific usage id can be done in a different driver. For
example an accelerometer driver can be a separate driver and
use the interface provided by this driver to register for
events.Signed-off-by: srinivas pandruvada
Signed-off-by: Jiri Kosina
Signed-off-by: Jonathan Cameron
03 Sep, 2012
1 commit
-
HID_LOGITECH_DJ uses "default m", which enables it in default kernel
builds. Since this module just enables extra, non-critical
functionality for one particular piece of hardware (specifically,
differentiating multiple wireless keyboards and mice as separate input
devices rather than treating them as one device), and the hardware works
just fine with the default USB HID support, drop the "default m".Signed-off-by: Josh Triplett
Signed-off-by: Jiri Kosina
15 Aug, 2012
1 commit
-
In order to make code maintenance easier, split the vairous
functions into individial files (this removes a bunch of #ifdefs).Signed-off-by: Bruno Prémont
Signed-off-by: Jiri Kosina
24 Jul, 2012
2 commits
-
Conflicts:
drivers/hid/Kconfig -
…nd 'upstream' into for-linus
19 Jul, 2012
1 commit
-
Signed-off-by: Benjamin Tissoires
Signed-off-by: Jiri Kosina
12 Jul, 2012
1 commit
-
Corrects two HID descriptor issues, which prevent some Holtek based
(USB ID 04d9:a055) keyboards from working. The error when not using
the driver is: generic-usb: probe ... failed with error -22 .Signed-off-by: Tom Harwood
Signed-off-by: Jiri Kosina
28 Jun, 2012
1 commit
-
Signed-off-by: Benjamin Tissoires
Signed-off-by: Jiri Kosina
27 Jun, 2012
1 commit
-
Pull HID fixes from Jiri Kosina:
"The most important one is a purification of Kconfig for CONFIG_HID;
the inclusion of HID groups and autoloading didn't leave the Kconfig
in a really consistent state. Henrik's patch fixes that. In addition
to that, there are two small fixes for logitech and magicmouse
drivers."* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: Fix the generic Kconfig options
HID: magicmouse: Correct report range of major / minor axes
HID: logitech: don't use stack based dj_report structures
25 Jun, 2012
1 commit
-
The generic HID driver is obviously not a special driver, so move it
outside of the special drivers menu. Explain the usage and make the
default follow the HID setting. This should simplify migration from
older kernels. While at it, remove the redundant HID_SUPPORT option
and modify the HID and USB_HID entries to better explain the bus
structure.Reported-by: Jan Beulich
Signed-off-by: Henrik Rydberg
Signed-off-by: Jiri Kosina
18 Jun, 2012
2 commits
-
commit 'HID: Driver for Lenovo Keyboard with Trackpoint'
(c1dcad2d32d0252e8a3023d20311b52a187ecda3) introduced a compiling error due to
unmetting dependency of CONFIG_LEDS_CLASS.on i386:
ERROR: "led_brightness_set" [drivers/leds/led-class.ko] undefined!
ERROR: "leds_list" [drivers/leds/led-class.ko] undefined!
ERROR: "leds_list_lock" [drivers/leds/led-class.ko] undefined!Reported-by: Randy Dunlap
Signed-off-by: Bryan Wu
Signed-off-by: Jiri Kosina -
This adds a dummy driver that will support user-space I/O drivers for the
HID subsystem. This allows to write transport-level drivers like USB-HID
and Bluetooth-HID in user-space.Low-Energy Bluetooth needs this to feed HID data that is parsed in
user-space back into the kernel.Signed-off-by: David Herrmann
Signed-off-by: Jiri Kosina
08 Jun, 2012
1 commit
-
This driver for the "Lenovo ThinkPad USB Keyboard with Trackpoint" supports
setting various device attributes, controlling mute and microphone mute
LEDs and enables use of the microphone mute key.Signed-off-by: Bernhard Seibold
Signed-off-by: Jiri Kosina
23 May, 2012
1 commit
-
Pull trivial updates from Jiri Kosina:
"As usual, it's mostly typo fixes, redundant code elimination and some
documentation updates."* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
edac, mips: don't change code that has been removed in edac/mips tree
xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
lib: Change mail address of Oskar Schirmer
net: Change mail address of Oskar Schirmer
arm/m68k: Change mail address of Sebastian Hess
i2c: Change mail address of Oskar Schirmer
net: Fix tcp_build_and_update_options comment in struct tcp_sock
atomic64_32.h: fix parameter naming mismatch
Kconfig: replace "--- help ---" with "---help---"
c2port: fix bogus Kconfig "default no"
edac: Fix spelling errors.
qla1280: Remove redundant NULL check before release_firmware() call
remoteproc: remove redundant NULL check before release_firmware()
qla2xxx: Remove redundant NULL check before release_firmware() call.
aic94xx: Get rid of redundant NULL check before release_firmware() call
tehuti: delete redundant NULL check before release_firmware()
qlogic: get rid of a redundant test for NULL before call to release_firmware()
bna: remove redundant NULL test before release_firmware()
tg3: remove redundant NULL test before release_firmware() call
typhoon: get rid of redundant conditional before all to release_firmware()
...
22 May, 2012
2 commits
-
Conflicts:
drivers/hid/hid-core.c -
Conflicts:
drivers/hid/hid-core.c
21 May, 2012
1 commit
-
CONFIG_HID_WACOM must depend on CONFIG_LEDS_CLASS, otherwise
CONFIG_NEW_LEDS may be disabled.Signed-off-by: David Rientjes
Signed-off-by: Jiri Kosina
11 May, 2012
1 commit
-
Add sysfs attribute to control LED selector on Wacom Intuos4. There are 4
different LEDs on the tablet and they can be turned on by something like:echo 50 > /sys/class/leds/(device # here)\:selector\:1/brightness
Only one can be lit at a time. The brightness range is 0 to 127. This patch
also contains short ABI description.Signed-off-by: Przemo Firszt
Signed-off-by: Jiri Kosina
01 May, 2012
1 commit
-
Move the hid drivers of the bus drivers to a common generic hid
driver, and make it a proper module. This ought to simplify device
handling moving forward.Cc: Gustavo Padovan
Signed-off-by: Henrik Rydberg
Signed-off-by: Jiri Kosina
24 Apr, 2012
1 commit
-
HID_BATTERY_STRENGTH is missing both help text and description text.
Reported-by: Geert Uytterhoeven
Signed-off-by: Jiri Kosina
19 Apr, 2012
1 commit
-
Commit 4f5ca836b "HID: hid-input: add support for HID devices reporting
Battery Strength" added the CONFIG_HID_BATTERY_STRENGTH option to report
the battery strength of HID devices. The commit log explicitly mentions
it not working properly with recent userspace, but it is default y
anyway. This is rather odd, and actually causes problems on real
systems.This works around Fedora bug
https://bugzilla.redhat.com/show_bug.cgi?id=806295Signed-off-by: Josh Boyer
Signed-off-by: Jiri Kosina
16 Apr, 2012
1 commit
-
Correct spelling typo in various Kconfig file.
Signed-off-by: Masanari Iida
Signed-off-by: Jiri Kosina
14 Apr, 2012
1 commit
-
Devices like Aureal Cy se W-01RN USB_V3.1 and some derived hardware
have a bogus HID Report Descriptor. According to that report descriptor,
the maximum logical value for key events is 1 and not 101 (101 keys).This quirk fixes this wrong Report Descriptor.
Signed-off-by: Josenivaldo Benito Junior
Signed-off-by: Franco Catrin
Signed-off-by: Jiri Kosina
29 Mar, 2012
1 commit
-
This patch fixes a silly mistake: HID_WACOM was dependent on HID_WACOM, so
the option wasn't showing up after make menuconfigSigned-off-by: Przemo Firszt
Signed-off-by: Jiri Kosina
28 Mar, 2012
2 commits
-
Trivial patch: now the hid-wacom driver supports also Intuos4 WL tablet.
Signed-off-by: Przemo Firszt
Signed-off-by: Jiri Kosina -
This option was ment as a safety mechanism in case the system treats the wacom
tablet battery as the main power supply. It's no longer required as now we can
distinguish between system power supply and device power supply.Signed-off-by: Przemo Firszt
Reviewed-by: Chris Bagwell
Signed-off-by: Jiri Kosina
20 Mar, 2012
2 commits
-
Conflicts:
drivers/hid/Makefile
13 Mar, 2012
1 commit
-
Add support for BT-driven configuration of the TiVo remote.
Reported-by: Joshua Dillon
Signed-off-by: Jiri Kosina
28 Feb, 2012
1 commit
-
Add support for three KYE tablets: EasyPen i405X, MousePen i608X, EasyPen M610X.
Update Kconfig entry accordingly, remove EXPERT dependency.Signed-off-by: Nikolai Kondrashov
Signed-off-by: Jiri Kosina
22 Feb, 2012
1 commit
-
The driver currently only supports the PS1000 controller.
It fixes the report descriptor by removing a non-existing axis and
clearing the constant bit on the d-pad and button input reports.Signed-off-by: Andreas Hübner
Signed-off-by: Jiri Kosina
21 Feb, 2012
2 commits
-
Before commit 534a7b8e1 ("HID: Add full support for Logitech Unifying
receivers") Logitech Unifying receiver can work as generic device
without special driver, after that commit these devices does not works
without special driver.After this patch they will use generic driver if special driver is disabled.
Signed-off-by: Konstantin Khlebnikov
Signed-off-by: Jiri Kosina -
While at it, also fix some minor codingstyle issues.
Signed-off-by: Denis Kovalev
Signed-off-by: Jiri Kosina
07 Feb, 2012
2 commits
-
Fix mismatch between Kconfig name and Makefile expectation.
Signed-off-by: Jiri Kosina
-
This patch finishes off adding full support for the TiVo Slide remote,
which is a mostly pure HID device from the perspective of the kernel.
There are a few mappings that use a vendor-specific usage page, and a
few keys in the consumer usage page that I think make sense to remap
slightly, to better fit their key labels' intended use. Doing this in a
stand-alone hid-tivo.c makes the modifications only matter for this
specific device.What's actually connected to the computer is a Broadcom-made usb dongle,
which has an embedded hub, bluetooth adapter, mouse and keyboard
devices. You pair with the dongle, then the remote sends data that its
converted into HID on the keyboard interface (the mouse interface
doesn't do anything interesting, so far as I can tell).lsusb for this device:
Bus 004 Device 005: ID 0a5c:2190 Broadcom Corp.
Bus 004 Device 004: ID 0a5c:4503 Broadcom Corp.
Bus 004 Device 003: ID 150a:1201
Bus 004 Device 002: ID 0a5c:4500 Broadcom Corp. BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth)Speaking of the keyboard interface, the remote actually does contain a
keyboard as well. The top slides away, revealing a reasonably functional
qwerty keyboard (not unlike many slide cell phones), thus the product
name.CC: Jiri Kosina
Signed-off-by: Jarod Wilson
Signed-off-by: Jiri Kosina
06 Feb, 2012
1 commit
-
Perixx Peripad 701 is an hybrid device which presents a touchpad and
a keyboard on the same surface. The switch between the two is controlled
by a physical switch, and the firmware sends the events on the right
interface (mouse, keyboard or multitouch).
This patch enables the multitouch interface of this device to work.We need to manually set the device as a trackpad (we cannot infer it
from the reports descriptors as the device works under Windows, a system
that does not allow multitouch touchpad).
We also need to set the hid feature MAX CONTACT NUMBER to 2 or the device
stops sending events once it has been pressed by two touches.Signed-off-by: Benjamin Tissoires
Acked-by: Henrik Rydberg
Signed-off-by: Jiri Kosina