3.5-stable patches

added patches:
	hid-add-asus-aio-keyboard-model-ak1d.patch
	hid-add-support-for-cypress-barcode-scanner-04b4-ed81.patch
	hid-multitouch-add-support-for-novatek-touchscreen.patch

diff --git a/queue-3.5/hid-add-asus-aio-keyboard-model-ak1d.patch b/queue-3.5/hid-add-asus-aio-keyboard-model-ak1d.patch
new file mode 100644 (file)
index 0000000..c17b8db
--- /dev/null
+++ b/queue-3.5/hid-add-asus-aio-keyboard-model-ak1d.patch
@@ -0,0 +1,53 @@
+From 2d8767bb421574dfcf48e4be0751ce7d8f73d5d7 Mon Sep 17 00:00:00 2001
+From: Cyrus Lien <cyrus.lien@canonical.com>
+Date: Mon, 23 Jul 2012 17:11:51 +0800
+Subject: HID: add ASUS AIO keyboard model AK1D
+
+From: Cyrus Lien <cyrus.lien@canonical.com>
+
+commit 2d8767bb421574dfcf48e4be0751ce7d8f73d5d7 upstream.
+
+Add Asus All-In-One PC keyboard model AK1D.
+
+BugLink: https://bugs.launchpad.net/bugs/1027789
+
+Signed-off-by: Cyrus Lien <cyrus.lien@canonical.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-chicony.c |    1 +
+ drivers/hid/hid-core.c    |    1 +
+ drivers/hid/hid-ids.h     |    1 +
+ 3 files changed, 3 insertions(+)
+
+--- a/drivers/hid/hid-chicony.c
++++ b/drivers/hid/hid-chicony.c
+@@ -60,6 +60,7 @@ static int ch_input_mapping(struct hid_d
+ static const struct hid_device_id ch_devices[] = {
+       { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
+       { }
+ };
+ MODULE_DEVICE_TABLE(hid, ch_devices);
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1521,6 +1521,7 @@ static const struct hid_device_id hid_ha
+       { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_AK1D) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_PRODIKEYS_PCMIDI) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -208,6 +208,7 @@
+ #define USB_DEVICE_ID_CHICONY_MULTI_TOUCH     0xb19d
+ #define USB_DEVICE_ID_CHICONY_WIRELESS        0x0618
+ #define USB_DEVICE_ID_CHICONY_WIRELESS2       0x1123
++#define USB_DEVICE_ID_CHICONY_AK1D    0x1125
+ 
+ #define USB_VENDOR_ID_CHUNGHWAT               0x2247
+ #define USB_DEVICE_ID_CHUNGHWAT_MULTITOUCH    0x0001

diff --git a/queue-3.5/hid-add-support-for-cypress-barcode-scanner-04b4-ed81.patch b/queue-3.5/hid-add-support-for-cypress-barcode-scanner-04b4-ed81.patch
new file mode 100644 (file)
index 0000000..0f753a6
--- /dev/null
+++ b/queue-3.5/hid-add-support-for-cypress-barcode-scanner-04b4-ed81.patch
@@ -0,0 +1,53 @@
+From 76c9d8fe2c7fc34ffc387d8022c5828d6ff9df48 Mon Sep 17 00:00:00 2001
+From: Lionel Vaux <lionel.vaux@free.fr>
+Date: Sun, 22 Jul 2012 11:32:20 +0200
+Subject: HID: add support for Cypress barcode scanner 04B4:ED81
+
+From: Lionel Vaux <lionel.vaux@free.fr>
+
+commit 76c9d8fe2c7fc34ffc387d8022c5828d6ff9df48 upstream.
+
+Add yet another device to the list of Cypress barcode scanners
+needing the CP_RDESC_SWAPPED_MIN_MAX quirk.
+
+Signed-off-by: Lionel Vaux (iouri) <lionel.vaux@free.fr>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-core.c    |    1 +
+ drivers/hid/hid-cypress.c |    2 ++
+ drivers/hid/hid-ids.h     |    1 +
+ 3 files changed, 4 insertions(+)
+
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1525,6 +1525,7 @@ static const struct hid_device_id hid_ha
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_1) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3) },
++      { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_4) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0006) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, 0x0011) },
+--- a/drivers/hid/hid-cypress.c
++++ b/drivers/hid/hid-cypress.c
+@@ -129,6 +129,8 @@ static const struct hid_device_id cp_dev
+               .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_3),
+               .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
++      { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_4),
++              .driver_data = CP_RDESC_SWAPPED_MIN_MAX },
+       { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE),
+               .driver_data = CP_2WHEEL_MOUSE_HACK },
+       { }
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -237,6 +237,7 @@
+ #define USB_DEVICE_ID_CYPRESS_BARCODE_1       0xde61
+ #define USB_DEVICE_ID_CYPRESS_BARCODE_2       0xde64
+ #define USB_DEVICE_ID_CYPRESS_BARCODE_3       0xbca1
++#define USB_DEVICE_ID_CYPRESS_BARCODE_4       0xed81
+ #define USB_DEVICE_ID_CYPRESS_TRUETOUCH       0xc001
+ 
+ #define USB_VENDOR_ID_DEALEXTREAME    0x10c5

diff --git a/queue-3.5/hid-multitouch-add-support-for-novatek-touchscreen.patch b/queue-3.5/hid-multitouch-add-support-for-novatek-touchscreen.patch
new file mode 100644 (file)
index 0000000..6f51277
--- /dev/null
+++ b/queue-3.5/hid-multitouch-add-support-for-novatek-touchscreen.patch
@@ -0,0 +1,47 @@
+From 4db703ead4535792ea54dba7275fdd1527848e74 Mon Sep 17 00:00:00 2001
+From: Austin Hendrix <ahendrix@willowgarage.com>
+Date: Mon, 4 Jun 2012 15:27:51 -0700
+Subject: HID: multitouch: add support for Novatek touchscreen
+
+From: Austin Hendrix <ahendrix@willowgarage.com>
+
+commit 4db703ead4535792ea54dba7275fdd1527848e74 upstream.
+
+Add support for a Novatek touchscreen panel as a generic HID multitouch
+panel.
+
+Signed-off-by: Austin Hendrix <ahendrix@willowgarage.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-ids.h        |    3 +++
+ drivers/hid/hid-multitouch.c |    5 +++++
+ 2 files changed, 8 insertions(+)
+
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -573,6 +573,9 @@
+ #define USB_VENDOR_ID_NINTENDO                0x057e
+ #define USB_DEVICE_ID_NINTENDO_WIIMOTE        0x0306
+ 
++#define USB_VENDOR_ID_NOVATEK         0x0603
++#define USB_DEVICE_ID_NOVATEK_PCT     0x0600
++
+ #define USB_VENDOR_ID_NTRIG           0x1b96
+ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN   0x0001
+ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_1   0x0003
+--- a/drivers/hid/hid-multitouch.c
++++ b/drivers/hid/hid-multitouch.c
+@@ -962,6 +962,11 @@ static const struct hid_device_id mt_dev
+               MT_USB_DEVICE(USB_VENDOR_ID_PANASONIC,
+                       USB_DEVICE_ID_PANABOARD_UBT880) },
+ 
++      /* Novatek Panel */
++      { .driver_data = MT_CLS_DEFAULT,
++              HID_USB_DEVICE(USB_VENDOR_ID_NOVATEK,
++                      USB_DEVICE_ID_NOVATEK_PCT) },
++
+       /* PenMount panels */
+       { .driver_data = MT_CLS_CONFIDENCE,
+               MT_USB_DEVICE(USB_VENDOR_ID_PENMOUNT,

diff --git a/queue-3.5/series b/queue-3.5/series
index ab43cd3cc7ada8e12bcb024795ec816bcd22c321..fb2e20bf76b54a18e31b5b9576c722b8be778409 100644 (file)
--- a/queue-3.5/series
+++ b/queue-3.5/series
@@ -58,3 +58,6 @@ random-remove-rand_initialize_irq.patch
 random-add-comment-to-random_initialize.patch
 dmi-feed-dmi-table-to-dev-random-driver.patch
 random-mix-in-architectural-randomness-in-extract_buf.patch
+hid-multitouch-add-support-for-novatek-touchscreen.patch
+hid-add-support-for-cypress-barcode-scanner-04b4-ed81.patch
+hid-add-asus-aio-keyboard-model-ak1d.patch