From 10c2a70450c42d84f6911b018dd0d633b2e9a214 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 14 Jul 2017 21:30:56 +0100 Subject: [PATCH] linux: fix HID patches (after drivers/hid/hid-core.c reorg) --- .../linux-051-ouya_controller_support.patch | 111 +++++++++++------- .../linux-053-spinelplus-remote-0.2.patch | 45 ++++--- 2 files changed, 98 insertions(+), 58 deletions(-) diff --git a/packages/linux/patches/default/linux-051-ouya_controller_support.patch b/packages/linux/patches/default/linux-051-ouya_controller_support.patch index 9b0f253372..1f336f48dd 100644 --- a/packages/linux/patches/default/linux-051-ouya_controller_support.patch +++ b/packages/linux/patches/default/linux-051-ouya_controller_support.patch @@ -1,18 +1,63 @@ -diff -Naur linux-3.19.orig/drivers/hid/hid-core.c linux-3.19/drivers/hid/hid-core.c ---- linux-3.19.orig/drivers/hid/hid-core.c 2015-02-20 14:01:17.080322846 -0800 -+++ linux-3.19/drivers/hid/hid-core.c 2015-02-20 14:03:30.375519421 -0800 -@@ -1884,6 +1884,7 @@ - { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) }, - { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, - { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, +From 6824d53bd503580226fbea3d9d78b32cab56ae42 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 19 Jun 2017 19:51:27 +0100 +Subject: [PATCH] OUYA controller support + +--- + drivers/hid/Kconfig | 6 ++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-ouya.c | 260 +++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 271 insertions(+) + create mode 100644 drivers/hid/hid-ouya.c + +diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig +index 687705c..84500fd 100644 +--- a/drivers/hid/Kconfig ++++ b/drivers/hid/Kconfig +@@ -625,6 +625,12 @@ config HID_ORTEK + - Ortek WKB-2000 + - Skycable wireless presenter + ++config HID_OUYA ++ tristate "OUYA Game Controller" ++ depends on USB_HID ++ ---help--- ++ Support for OUYA Game Controller. ++ + config HID_PANTHERLORD + tristate "Pantherlord/GreenAsia game controller" + depends on HID +diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile +index fef027b..4e22940 100644 +--- a/drivers/hid/Makefile ++++ b/drivers/hid/Makefile +@@ -66,6 +66,7 @@ obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o + obj-$(CONFIG_HID_NTI) += hid-nti.o + obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o + obj-$(CONFIG_HID_ORTEK) += hid-ortek.o ++obj-$(CONFIG_HID_OUYA) += hid-ouya.o + obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o + obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o + obj-$(CONFIG_HID_PENMOUNT) += hid-penmount.o +diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c +index 6e04069..32bcb50 100644 +--- a/drivers/hid/hid-core.c ++++ b/drivers/hid/hid-core.c +@@ -2290,6 +2290,7 @@ static const struct hid_device_id hid_have_special_driver[] = { + #if IS_ENABLED(CONFIG_HID_ZYDACRON) + { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) }, + #endif + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_OUYA, USB_DEVICE_ID_OUYA_CONTROLLER) }, - { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_6000) }, - { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) }, -diff -Naur linux-3.19.orig/drivers/hid/hid-ids.h linux-3.19/drivers/hid/hid-ids.h ---- linux-3.19.orig/drivers/hid/hid-ids.h 2015-02-20 14:01:17.080322846 -0800 -+++ linux-3.19/drivers/hid/hid-ids.h 2015-02-20 14:03:30.382519482 -0800 -@@ -721,6 +721,9 @@ + { } + }; + +diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h +index 8ca1e8c..f3cd724 100644 +--- a/drivers/hid/hid-ids.h ++++ b/drivers/hid/hid-ids.h +@@ -813,6 +813,9 @@ #define USB_DEVICE_ID_ORTEK_PKB1700 0x1700 #define USB_DEVICE_ID_ORTEK_WKB2000 0x2000 @@ -22,9 +67,11 @@ diff -Naur linux-3.19.orig/drivers/hid/hid-ids.h linux-3.19/drivers/hid/hid-ids. #define USB_VENDOR_ID_PLANTRONICS 0x047f #define USB_VENDOR_ID_PANASONIC 0x04da -diff -Naur linux-3.19.orig/drivers/hid/hid-ouya.c linux-3.19/drivers/hid/hid-ouya.c ---- linux-3.19.orig/drivers/hid/hid-ouya.c 1969-12-31 16:00:00.000000000 -0800 -+++ linux-3.19/drivers/hid/hid-ouya.c 2015-02-20 14:03:30.371519386 -0800 +diff --git a/drivers/hid/hid-ouya.c b/drivers/hid/hid-ouya.c +new file mode 100644 +index 0000000..7792c23 +--- /dev/null ++++ b/drivers/hid/hid-ouya.c @@ -0,0 +1,260 @@ +/* + * HID driver for OUYA Game Controller(s) @@ -286,30 +333,6 @@ diff -Naur linux-3.19.orig/drivers/hid/hid-ouya.c linux-3.19/drivers/hid/hid-ouy + +module_init(ouya_init); +module_exit(ouya_exit); -diff -Naur linux-3.19.orig/drivers/hid/Kconfig linux-3.19/drivers/hid/Kconfig ---- linux-3.19.orig/drivers/hid/Kconfig 2015-02-20 14:01:17.081322855 -0800 -+++ linux-3.19/drivers/hid/Kconfig 2015-02-20 14:03:30.381519473 -0800 -@@ -528,6 +528,12 @@ - - Ortek WKB-2000 - - Skycable wireless presenter - -+config HID_OUYA -+ tristate "OUYA Game Controller" -+ depends on USB_HID -+ ---help--- -+ Support for OUYA Game Controller. -+ - config HID_PANTHERLORD - tristate "Pantherlord/GreenAsia game controller" - depends on HID -diff -Naur linux-3.19.orig/drivers/hid/Makefile linux-3.19/drivers/hid/Makefile ---- linux-3.19.orig/drivers/hid/Makefile 2015-02-20 14:01:17.081322855 -0800 -+++ linux-3.19/drivers/hid/Makefile 2015-02-20 14:03:30.382519482 -0800 -@@ -70,6 +70,7 @@ - obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o - obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o - obj-$(CONFIG_HID_ORTEK) += hid-ortek.o -+obj-$(CONFIG_HID_OUYA) += hid-ouya.o - obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o - obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o - obj-$(CONFIG_HID_PENMOUNT) += hid-penmount.o +-- +2.7.4 + diff --git a/packages/linux/patches/default/linux-053-spinelplus-remote-0.2.patch b/packages/linux/patches/default/linux-053-spinelplus-remote-0.2.patch index 1b645d5ebe..c245191d48 100644 --- a/packages/linux/patches/default/linux-053-spinelplus-remote-0.2.patch +++ b/packages/linux/patches/default/linux-053-spinelplus-remote-0.2.patch @@ -1,8 +1,22 @@ +From 91310f578291eabef1316eed38f79b05b8eaf568 Mon Sep 17 00:00:00 2001 +From: MilhouseVH +Date: Mon, 19 Jun 2017 20:01:53 +0100 +Subject: [PATCH] Spinel Plus remote 0.2 + +--- + drivers/hid/Kconfig | 6 +++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 4 ++ + drivers/hid/hid-ids.h | 4 ++ + drivers/hid/hid-spinelplus.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 110 insertions(+) + create mode 100644 drivers/hid/hid-spinelplus.c + diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig -index cd4599c..86b22f7 100644 +index 84500fd..6b625cf 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig -@@ -768,6 +768,12 @@ config HID_STEELSERIES +@@ -808,6 +808,12 @@ config HID_STEELSERIES ---help--- Support for Steelseries SRW-S1 steering wheel @@ -16,10 +30,10 @@ index cd4599c..86b22f7 100644 tristate "Sunplus wireless desktop" depends on HID diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile -index 86b2b57..89dbf38 100644 +index 4e22940..3205d88 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile -@@ -88,6 +88,7 @@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o +@@ -92,6 +92,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 @@ -28,25 +42,25 @@ index 86b2b57..89dbf38 100644 obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 2b89c70..c83cfdc 100644 +index 32bcb50..11985b4 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -2014,6 +2014,10 @@ static const struct hid_device_id hid_have_special_driver[] = { - { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, - { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_6000) }, - { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, +@@ -2291,6 +2291,10 @@ static const struct hid_device_id hid_have_special_driver[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) }, + #endif + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_OUYA, USB_DEVICE_ID_OUYA_CONTROLLER) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_4) }, - { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) }, - { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) }, - { HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) }, + { } + }; + diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 9845189..e016cd1 100644 +index f3cd724..b67d5e5 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -813,6 +813,10 @@ +@@ -841,6 +841,10 @@ #define USB_VENDOR_ID_PHILIPS 0x0471 #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617 @@ -158,3 +172,6 @@ index 0000000..381c7b3 +module_hid_driver(spinelplus_driver); + +MODULE_LICENSE("GPL"); +-- +2.7.4 +