backport some low impact enablement for the pegatron tables
This commit is contained in:
Kyle McMartin
parent
fcfc30ed64
commit
e56d281126
|
|
@ -0,0 +1,37 @@
|
|||
From: Andy Ross <andy.ross@windriver.com>
|
||||
Date: Mon, 9 May 2011 23:11:16 +0000 (-0700)
|
||||
Subject: Bluetooth: Device ids for ath3k on Pegatron Lucid tablets
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fpadovan%2Fbluetooth-next-2.6.git;a=commitdiff_plain;h=2a7bccccdb9604a717c2128a931f022267d35629
|
||||
|
||||
Bluetooth: Device ids for ath3k on Pegatron Lucid tablets
|
||||
|
||||
New ath3k device IDs used on the Pegatron Lucid (ExoPC and WeTab) units.
|
||||
|
||||
Signed-off-by: Andy Ross <andy.ross@windriver.com>
|
||||
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
|
||||
---
|
||||
|
||||
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c
|
||||
index 695d441..6bacef3 100644
|
||||
--- a/drivers/bluetooth/ath3k.c
|
||||
+++ b/drivers/bluetooth/ath3k.c
|
||||
@@ -62,6 +62,7 @@ static struct usb_device_id ath3k_table[] = {
|
||||
|
||||
/* Atheros AR3011 with sflash firmware*/
|
||||
{ USB_DEVICE(0x0CF3, 0x3002) },
|
||||
+ { USB_DEVICE(0x13d3, 0x3304) },
|
||||
|
||||
/* Atheros AR9285 Malbec with sflash firmware */
|
||||
{ USB_DEVICE(0x03F0, 0x311D) },
|
||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||
index 762a510..c2de895 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -104,6 +104,7 @@ static struct usb_device_id blacklist_table[] = {
|
||||
|
||||
/* Atheros 3011 with sflash firmware */
|
||||
{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE },
|
||||
+ { USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE },
|
||||
|
||||
/* Atheros AR9285 Malbec with sflash firmware */
|
||||
{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
From: Benjamin Tissoires <benjamin.tissoires@enac.fr>
|
||||
Date: Thu, 19 May 2011 09:37:29 +0000 (+0200)
|
||||
Subject: HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjikos%2Fhid.git;a=commitdiff_plain;h=c04abeeff9d76a703cac1e6d312853b0fc8136f5
|
||||
|
||||
HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
|
||||
|
||||
This patch adds support for Elo TouchSystems 2515 IntelliTouch Plus
|
||||
that can be found in Lenovo A700 all-in-one.
|
||||
|
||||
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
|
||||
Tested-by: Bastien Nocera <hadess@hadess.net>
|
||||
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
||||
|
||||
--- a/drivers/hid/Kconfig
|
||||
+++ b/drivers/hid/Kconfig
|
||||
@@ -309,6 +309,7 @@ config HID_MULTITOUCH
|
||||
|
||||
Say Y here if you have one of the following devices:
|
||||
- Cypress TrueTouch panels
|
||||
+ - Elo TouchSystems IntelliTouch Plus panels
|
||||
- Hanvon dual touch panels
|
||||
- Pixcir dual touch panels
|
||||
- 'Sensing Win7-TwoFinger' panel by GeneralTouch
|
||||
--- a/drivers/hid/hid-core.c
|
||||
+++ b/drivers/hid/hid-core.c
|
||||
@@ -1335,6 +1335,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2515) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -219,6 +219,7 @@
|
||||
#define USB_VENDOR_ID_DREAM_CHEEKY 0x1d34
|
||||
|
||||
#define USB_VENDOR_ID_ELO 0x04E7
|
||||
+#define USB_DEVICE_ID_ELO_TS2515 0x0022
|
||||
#define USB_DEVICE_ID_ELO_TS2700 0x0020
|
||||
|
||||
#define USB_VENDOR_ID_EMS 0x2006
|
||||
--- a/drivers/hid/hid-multitouch.c
|
||||
+++ b/drivers/hid/hid-multitouch.c
|
||||
@@ -69,6 +69,7 @@ struct mt_class {
|
||||
#define MT_CLS_DUAL1 2
|
||||
#define MT_CLS_DUAL2 3
|
||||
#define MT_CLS_CYPRESS 4
|
||||
+#define MT_CLS_DUAL_NSMU_CONTACTID 5
|
||||
|
||||
/*
|
||||
* these device-dependent functions determine what slot corresponds
|
||||
@@ -119,6 +120,11 @@ struct mt_class mt_classes[] = {
|
||||
MT_QUIRK_CYPRESS,
|
||||
.maxcontacts = 10 },
|
||||
|
||||
+ { .name = MT_CLS_DUAL_NSMU_CONTACTID,
|
||||
+ .quirks = MT_QUIRK_NOT_SEEN_MEANS_UP |
|
||||
+ MT_QUIRK_SLOT_IS_CONTACTID,
|
||||
+ .maxcontacts = 2 },
|
||||
+
|
||||
{ }
|
||||
};
|
||||
|
||||
@@ -465,6 +471,11 @@ static const struct hid_device_id mt_devices[] = {
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS,
|
||||
USB_DEVICE_ID_CYPRESS_TRUETOUCH) },
|
||||
|
||||
+ /* Elo TouchSystems IntelliTouch Plus panel */
|
||||
+ { .driver_data = MT_CLS_DUAL_NSMU_CONTACTID,
|
||||
+ HID_USB_DEVICE(USB_VENDOR_ID_ELO,
|
||||
+ USB_DEVICE_ID_ELO_TS2515) },
|
||||
+
|
||||
/* GeneralTouch panel */
|
||||
{ .driver_data = MT_CLS_DUAL2,
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH,
|
||||
11
kernel.spec
11
kernel.spec
|
|
@ -754,6 +754,9 @@ Patch12408: x86-amd-arat-bug-on-sempron-workaround.patch
|
|||
Patch12410: mm-vmscan-correct-use-of-pgdat_balanced-in-sleeping_prematurely.patch
|
||||
Patch12411: mm-vmscan-correctly-check-if-reclaimer-should-schedule-during-shrink_slab.patch
|
||||
|
||||
Patch12415: hid-multitouch-add-support-for-elo-touchsystems.patch
|
||||
Patch12416: bluetooth-device-ids-for-ath3k-on-pegatron-lucid-tablets.patch
|
||||
|
||||
%endif
|
||||
|
||||
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
|
||||
|
|
@ -1401,6 +1404,9 @@ ApplyPatch x86-amd-arat-bug-on-sempron-workaround.patch
|
|||
ApplyPatch mm-vmscan-correct-use-of-pgdat_balanced-in-sleeping_prematurely.patch
|
||||
ApplyPatch mm-vmscan-correctly-check-if-reclaimer-should-schedule-during-shrink_slab.patch
|
||||
|
||||
ApplyPatch hid-multitouch-add-support-for-elo-touchsystems.patch
|
||||
ApplyPatch bluetooth-device-ids-for-ath3k-on-pegatron-lucid-tablets.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -2009,6 +2015,11 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Tue May 24 2011 Kyle McMartin <kmcmartin@redhat.com>
|
||||
- hid-multitouch: add support for elo touchsystems panels (requested
|
||||
by hadess, backported from hid-next)
|
||||
- bluetooth: add support for more ath3k devices (Ditto.)
|
||||
|
||||
* Mon May 23 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38.7-29
|
||||
- Linux 2.6.38.7
|
||||
- Eliminate hangs when using frequent high-order allocations
|
||||
|
|
|
|||
Loading…
Reference in New Issue