Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus (99ce58dd) · Commits · e / devices / android_kernel_xiaomi_sm6125

Documentation/ABI/testing/sysfs-driver-wacom

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,14 @@ Description:
	or 0 otherwise. Writing to this file one of these values		or 0 otherwise. Writing to this file one of these values
	switches reporting speed.		switches reporting speed.

			What: /sys/class/leds/0005\:056A\:00BD.0001\:selector\:*/
			Date: May 2012
			Kernel Version: 3.5
			Contact: linux-bluetooth@vger.kernel.org
			Description:
			LED selector for Intuos4 WL. There are 4 leds, but only one LED
			can be lit at a time. Max brightness is 127.

	What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/led		What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/led
	Date: August 2011		Date: August 2011
	Contact: linux-input@vger.kernel.org		Contact: linux-input@vger.kernel.org

drivers/hid/Kconfig

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -32,9 +32,13 @@ config HID
	If unsure, say Y.		If unsure, say Y.

	config HID_BATTERY_STRENGTH		config HID_BATTERY_STRENGTH
	bool		bool "Battery level reporting for HID devices"
	depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY		depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
	default n		default n
			---help---
			This option adds support of reporting battery strength (for HID devices
			that support this feature) through power_supply class so that userspace
			tools, such as upower, can display it.

	config HIDRAW		config HIDRAW
	bool "/dev/hidraw raw HID device support"		bool "/dev/hidraw raw HID device support"
	@@ -613,16 +617,10 @@ config THRUSTMASTER_FF
	config HID_WACOM		config HID_WACOM
	tristate "Wacom Bluetooth devices support"		tristate "Wacom Bluetooth devices support"
	depends on BT_HIDP		depends on BT_HIDP
	---help---		depends on LEDS_CLASS
	Support for Wacom Graphire Bluetooth tablet.

	config HID_WACOM_POWER_SUPPLY
	bool "Wacom Bluetooth devices power supply status support"
	depends on HID_WACOM
	select POWER_SUPPLY		select POWER_SUPPLY
	---help---		---help---
	Say Y here if you want to enable power supply status monitoring for		Support for Wacom Graphire Bluetooth and Intuos4 WL tablets.
	Wacom Bluetooth devices.

	config HID_WIIMOTE		config HID_WIIMOTE
	tristate "Nintendo Wii Remote support"		tristate "Nintendo Wii Remote support"

drivers/hid/hid-apple.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -458,6 +458,9 @@ static const struct hid_device_id apple_devices[] = {
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),
	.driver_data = APPLE_NUMLOCK_EMULATION \| APPLE_HAS_FN \|		.driver_data = APPLE_NUMLOCK_EMULATION \| APPLE_HAS_FN \|
	APPLE_ISO_KEYBOARD },		APPLE_ISO_KEYBOARD },
			{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
			USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI),
			.driver_data = APPLE_NUMLOCK_EMULATION \| APPLE_HAS_FN },
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),		{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
	.driver_data = APPLE_NUMLOCK_EMULATION \| APPLE_HAS_FN },		.driver_data = APPLE_NUMLOCK_EMULATION \| APPLE_HAS_FN },
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

drivers/hid/hid-core.c

+1 −1

drivers/hid/hid-ids.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -756,6 +756,7 @@
	#define USB_DEVICE_ID_WALTOP_PID_0038 0x0038		#define USB_DEVICE_ID_WALTOP_PID_0038 0x0038
	#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH 0x0501		#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH 0x0501
	#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH 0x0500		#define USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH 0x0500
			#define USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET 0x0502

	#define USB_VENDOR_ID_WISEGROUP 0x0925		#define USB_VENDOR_ID_WISEGROUP 0x0925
	#define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005		#define USB_DEVICE_ID_SMARTJOY_PLUS 0x0005

Original line number	Original line	Diff line number	Diff line
	@@ -1511,7 +1511,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },		{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },		{ HID_USB_DEVICE(USB_VENDOR_ID_AUREAL, USB_DEVICE_ID_AUREAL_W01RN) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },		{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_BAANTO, USB_DEVICE_ID_BAANTO_MT_190W2), },
	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },		{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },		{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },		{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
	@@ -1660,6 +1659,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_PID_0038) },		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_PID_0038) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_10_6_INCH) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },		{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_MEDIA_TABLET_14_1_INCH) },
			{ HID_USB_DEVICE(USB_VENDOR_ID_WALTOP, USB_DEVICE_ID_WALTOP_SIRIUS_BATTERY_FREE_TABLET) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) },		{ HID_USB_DEVICE(USB_VENDOR_ID_X_TENSIONS, USB_DEVICE_ID_SPEEDLINK_VAD_CEZANNE) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },		{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },		{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },