rpms/kernel/F-11 linux-2.6-hid-apple-mini-keyboard.patch, NONE, 1.1 kernel.spec, 1.1664, 1.1665

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2126

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-hid-apple-mini-keyboard.patch 
Log Message:
Add support for Apple mini keyboard (#507517)

linux-2.6-hid-apple-mini-keyboard.patch:

--- NEW FILE linux-2.6-hid-apple-mini-keyboard.patch ---
From: Ryan Finnie <ryan at finnie.org>
Date: Thu, 5 Mar 2009 09:18:01 +0000 (+0100)
Subject: HID: Support Apple mini aluminum keyboard
X-Git-Tag: v2.6.30-rc1~219^2~4
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=fef3f571ecc2a82395c531d97b3f71a59e04e946

HID: Support Apple mini aluminum keyboard

New USB device ids and quirks for the "mini" Apple USB aluminum
keyboards released Tuesday, model A1242.  Note that while I own the ANSI
(0x021d) version and cannot verify that the ISO (0x021e) and JIS
(0x021f) versions exist, previous releases have followed the triple id
convention for awhile now, and the device ids fit perfectly between
USB_DEVICE_ID_APPLE_GEYSER4_* and USB_DEVICE_ID_APPLE_ALU_*.

Signed-off-by: Ryan Finnie <ryan at finnie.org>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
---

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index aa28aed..7ed94cf 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -387,6 +387,12 @@ static const struct hid_device_id apple_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),
 		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
 			APPLE_RDESC_JIS },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI),
+		.driver_data = APPLE_HAS_FN },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO),
+		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS),
+		.driver_data = APPLE_HAS_FN },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),
 		.driver_data = APPLE_HAS_FN },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 646ba22..74bec03 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1236,6 +1236,9 @@ static const struct hid_device_id hid_blacklist[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ANSI) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_ISO) },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_MINI_JIS) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 7270ccc..65b790f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -67,6 +67,9 @@
 #define USB_DEVICE_ID_APPLE_GEYSER4_ANSI	0x021a
 #define USB_DEVICE_ID_APPLE_GEYSER4_ISO	0x021b
 #define USB_DEVICE_ID_APPLE_GEYSER4_JIS	0x021c
+#define USB_DEVICE_ID_APPLE_ALU_MINI_ANSI	0x021d
+#define USB_DEVICE_ID_APPLE_ALU_MINI_ISO	0x021e
+#define USB_DEVICE_ID_APPLE_ALU_MINI_JIS	0x021f
 #define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220
 #define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221
 #define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1664
retrieving revision 1.1665
diff -u -p -r1.1664 -r1.1665
--- kernel.spec	29 Jun 2009 17:52:54 -0000	1.1664
+++ kernel.spec	29 Jun 2009 18:42:41 -0000	1.1665
@@ -644,6 +644,7 @@ Patch454: linux-2.6-input-atkbd-forced-r
 Patch455: linux-2.6-input-bcm5974-new-header-type.patch
 Patch456: linux-2.6-input-bcm5974-add-quad-finger.patch
 Patch457: linux-2.6-input-bcm5974-add-macbook-unibody.patch
+Patch458: linux-2.6-hid-apple-mini-keyboard.patch
 
 Patch470: linux-2.6-serial-460800.patch
 Patch471: linux-2.6-serial-add-txen-test-param.patch
@@ -1334,6 +1335,9 @@ ApplyPatch linux-2.6-input-bcm5974-new-h
 ApplyPatch linux-2.6-input-bcm5974-add-quad-finger.patch
 ApplyPatch linux-2.6-input-bcm5974-add-macbook-unibody.patch
 
+# support apple mini keyboard (#507517)
+ApplyPatch linux-2.6-hid-apple-mini-keyboard.patch
+
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 # let users skip the TXEN bug test
@@ -2073,6 +2077,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jun 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.5-203
+- Add support for Apple mini keyboard (#507517)
+
 * Mon Jun 29 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.5-202
 - New debug patch for null selinux credentials (for bug #494067)