From f04d51404f51947d3feabf2518495ba5aa3bb2c4 Mon Sep 17 00:00:00 2001 From: Colin Leitner Date: Mon, 27 May 2013 23:41:05 +0200 Subject: HID: driver for PS2/3 Buzz controllers This patch adds support for PS2/3 Buzz controllers into hid-sony It has been tested on Debian 7 with kernel version 3.10.0-rc2. Unfortunately I can't test the patch with a regular six-axis controller myself. Signed-off-by: Colin Leitner Cc: Jiri Kosina Cc: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/hid/Kconfig | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'drivers/hid/Kconfig') diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index fb52f3f6de80..53caf0b115cb 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -594,10 +594,15 @@ config HID_SAMSUNG Support for Samsung InfraRed remote control or keyboards. config HID_SONY - tristate "Sony PS3 controller" + tristate "Sony PS2/3 accessories" depends on USB_HID + select NEW_LEDS + select LEDS_CLASS ---help--- - Support for Sony PS3 6-axis controllers. + Support for + + * Sony PS3 6-axis controllers + * Buzz controllers Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE. -- cgit v1.2.3 From 40e32ee6e475852f532c847ed1804b87f6531a67 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Tue, 28 May 2013 11:22:09 +0200 Subject: HID: sony: fix leds dependency The newly added support for Buzz controller - introduced Kconfig selection of LEDS_CLASS - introduced conditional preprocessor checking for CONFIG_LEDS_CLASS This has multiple problems -- namely select doesn't work transitively, so it shouldn't be used. On the other hand the code assumed that LEDS_CLASS is enabled in some places, but not everywhere. Put LEDS_CLASS as a Kconfig dependency for hid-sony and remove all the CONFIG_LEDS_CLASS conditionals from hid-sony. Reported-by: fengguang.wu@intel.com Signed-off-by: Jiri Kosina --- drivers/hid/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/hid/Kconfig') diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 53caf0b115cb..5bad26ef227a 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -596,8 +596,8 @@ config HID_SAMSUNG config HID_SONY tristate "Sony PS2/3 accessories" depends on USB_HID - select NEW_LEDS - select LEDS_CLASS + depends on NEW_LEDS + depends on LEDS_CLASS ---help--- Support for -- cgit v1.2.3 From 68e353fe476e7dab4644b9e7b4979b72726397ae Mon Sep 17 00:00:00 2001 From: Martin Rusko Date: Tue, 28 May 2013 14:25:15 +0200 Subject: HID: add support for Huion 580 tablet Add hid-huion.c with support for Huion 580 tablet, which is simple 8x5" tablet with 4000LPI resolution and 2048 levels pressure-sensitive pen manufactured by the Chinese company Huion. The driver fixes incorrect report descriptor sent by the device, performs custom initialization required to switch the tablet into its native resolution mode and inverts the in-range bit. Signed-off-by: Martin Rusko Signed-off-by: Jiri Kosina --- drivers/hid/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'drivers/hid/Kconfig') diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index fb52f3f6de80..015e6156caaf 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -240,6 +240,12 @@ config HOLTEK_FF Say Y here if you have a Holtek On Line Grip based game controller and want to have force feedback support for it. +config HID_HUION + tristate "Huion tablets" + depends on USB_HID + ---help--- + Support for Huion 580 tablet. + config HID_KEYTOUCH tristate "Keytouch HID devices" depends on HID -- cgit v1.2.3 From 078328da5d5dfbd2b1333eb545bd89d6dfa984ef Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Thu, 13 Jun 2013 12:03:49 +0200 Subject: HID: fold ps3remote driver into generic Sony driver Let's follow the structure we are trying to keep for most of the specific HID drivers, and let the separation follow the producing vendor. Merge functionality provided by ps3remote driver into hid-sony. Tested-by: David Dillow Signed-off-by: Jiri Kosina --- drivers/hid/Kconfig | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'drivers/hid/Kconfig') diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 5bad26ef227a..8280eba43e14 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -561,15 +561,6 @@ 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 HID - ---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 @@ -600,11 +591,11 @@ config HID_SONY depends on LEDS_CLASS ---help--- Support for - + * Sony PS3 6-axis controllers * Buzz controllers - - Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE. + * Sony PS3 Blue-ray Disk Remote Control (Bluetooth) + * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth) config HID_SPEEDLINK tristate "Speedlink VAD Cezanne mouse support" -- cgit v1.2.3