rpms/kernel/devel linux-2.6-input-macbook-appletouch.patch, NONE, 1.1 kernel.spec, 1.492, 1.493

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7800

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-input-macbook-appletouch.patch 
Log Message:
- Recognise Appletouch trackpad in Macbook 3.1

linux-2.6-input-macbook-appletouch.patch:

--- NEW FILE linux-2.6-input-macbook-appletouch.patch ---
https://bugzilla.redhat.com/show_bug.cgi?id=426574
Based on patch from ubuntu at
https://bugs.edge.launchpad.net/ubuntu/+source/linux-meta/+bug/162090

--- vanilla-2.6.25-rc5/drivers/input/mouse/appletouch.c	2008-01-24 17:58:37.000000000 -0500
+++ linux-2.6.24.noarch/drivers/input/mouse/appletouch.c	2008-03-11 13:42:59.000000000 -0400
@@ -62,6 +62,11 @@
 #define GEYSER4_ISO_PRODUCT_ID	0x021B
 #define GEYSER4_JIS_PRODUCT_ID	0x021C
 
+/* Codes in updated driver for macbook3,1 support (and others?) */
+#define GEYSER4_HF_ANSI_PRODUCT_ID	0x0229
+#define GEYSER4_HF_ISO_PRODUCT_ID	0x022a
+#define GEYSER4_HF_JIS_PRODUCT_ID	0x021b
+
 #define ATP_DEVICE(prod)					\
 	.match_flags = USB_DEVICE_ID_MATCH_DEVICE |		\
 		       USB_DEVICE_ID_MATCH_INT_CLASS |		\
@@ -93,6 +98,11 @@ static struct usb_device_id atp_table []
 	{ ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) },
 	{ ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) },
 
+	/* Core2 Duo MacBook3,1 */
+	{ ATP_DEVICE(GEYSER4_HF_ANSI_PRODUCT_ID) },
+	{ ATP_DEVICE(GEYSER4_HF_ISO_PRODUCT_ID) },
+	{ ATP_DEVICE(GEYSER4_HF_JIS_PRODUCT_ID) },
+
 	/* Terminating entry */
 	{ }
 };
@@ -217,7 +227,10 @@ static inline int atp_is_geyser_3(struct
 		(productId == GEYSER3_JIS_PRODUCT_ID) ||
 		(productId == GEYSER4_ANSI_PRODUCT_ID) ||
 		(productId == GEYSER4_ISO_PRODUCT_ID) ||
-		(productId == GEYSER4_JIS_PRODUCT_ID);
+		(productId == GEYSER4_JIS_PRODUCT_ID) ||
+		(productId == GEYSER4_HF_ANSI_PRODUCT_ID) ||
+		(productId == GEYSER4_HF_ISO_PRODUCT_ID) ||
+		(productId == GEYSER4_HF_JIS_PRODUCT_ID);
 }
 
 /*


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.492
retrieving revision 1.493
diff -u -r1.492 -r1.493
--- kernel.spec	11 Mar 2008 18:05:41 -0000	1.492
+++ kernel.spec	11 Mar 2008 18:23:09 -0000	1.493
@@ -602,6 +602,7 @@
 Patch420: linux-2.6-squashfs.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
+Patch451: linux-2.6-input-macbook-appletouch.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
@@ -1091,6 +1092,8 @@
 # Misc fixes
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
+ApplyPatch linux-2.6-input-macbook-appletouch.patch
+
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 # Silence some useless messages that still get printed with 'quiet'
@@ -1752,6 +1755,9 @@
 
 %changelog
 * Tue Mar 11 2008 Dave Jones <davej at redhat.com>
+- Recognise Appletouch trackpad in Macbook 3.1
+
+* Tue Mar 11 2008 Dave Jones <davej at redhat.com>
 - 2.6.25-rc5-git1
 
 * Tue Mar 11 2008 Dave Airlie <airlied at redhat.com>