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

Commit 0d69a3c7 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus 

Conflicts:
	drivers/hid/hid-core.c
parents 73759518 99d24902 7e415762

Documentation/ABI/testing/sysfs-driver-hid-srws1

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/class/leds/SRWS1::<serial>::RPM1

What:		/sys/class/leds/SRWS1::<serial>::RPM2

What:		/sys/class/leds/SRWS1::<serial>::RPM3

What:		/sys/class/leds/SRWS1::<serial>::RPM4

What:		/sys/class/leds/SRWS1::<serial>::RPM5

What:		/sys/class/leds/SRWS1::<serial>::RPM6

What:		/sys/class/leds/SRWS1::<serial>::RPM7

What:		/sys/class/leds/SRWS1::<serial>::RPM8

What:		/sys/class/leds/SRWS1::<serial>::RPM9

What:		/sys/class/leds/SRWS1::<serial>::RPM10

What:		/sys/class/leds/SRWS1::<serial>::RPM11

What:		/sys/class/leds/SRWS1::<serial>::RPM12

What:		/sys/class/leds/SRWS1::<serial>::RPM13

What:		/sys/class/leds/SRWS1::<serial>::RPM14

What:		/sys/class/leds/SRWS1::<serial>::RPM15

What:		/sys/class/leds/SRWS1::<serial>::RPMALL

Date:		Jan 2013

KernelVersion:	3.9

Contact:	Simon Wood <simon@mungewell.org>

Description:	Provides a control for turning on/off the LEDs which form

		an RPM meter on the front of the controller

drivers/hid/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -596,6 +596,12 @@ config HID_SPEEDLINK 
	---help---

	Support for Speedlink Vicious and Divine Cezanne mouse.



config HID_STEELSERIES

	tristate "Steelseries SRW-S1 steering wheel support"

	depends on USB_HID

	---help---

	Support for Steelseries SRW-S1 steering wheel



config HID_SUNPLUS

	tristate "Sunplus wireless desktop"

	depends on USB_HID

drivers/hid/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o 
obj-$(CONFIG_HID_SMARTJOYPLUS)	+= hid-sjoy.o

obj-$(CONFIG_HID_SONY)		+= hid-sony.o

obj-$(CONFIG_HID_SPEEDLINK)	+= hid-speedlink.o

obj-$(CONFIG_HID_STEELSERIES)	+= hid-steelseries.o

obj-$(CONFIG_HID_SUNPLUS)	+= hid-sunplus.o

obj-$(CONFIG_HID_GREENASIA)	+= hid-gaff.o

obj-$(CONFIG_HID_THINGM)	+= hid-thingm.o

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1702,6 +1702,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ 


#define USB_VENDOR_ID_SONY			0x054c

#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b

#define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE	0x0374

#define USB_DEVICE_ID_SONY_PS3_BDREMOTE		0x0306

#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268

#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER	0x042f
@@ -732,6 +733,9 @@ 
#define USB_VENDOR_ID_STANTUM_SITRONIX		0x1403

#define USB_DEVICE_ID_MTP_SITRONIX		0x5001



#define USB_VENDOR_ID_STEELSERIES	0x1038

#define USB_DEVICE_ID_STEELSERIES_SRWS1	0x1410



#define USB_VENDOR_ID_SUN		0x0430

#define USB_DEVICE_ID_RARITAN_KVM_DONGLE	0xcdab