From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: Re: [PATCH] input: wellspring device quirks Date: Sun, 13 Jul 2008 00:10:38 -0700 Message-ID: <20080713001038.81c734bc.akpm@linux-foundation.org> References: <1215931622.15888.0.camel@alnilam> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:54751 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752564AbYGMHNP (ORCPT ); Sun, 13 Jul 2008 03:13:15 -0400 In-Reply-To: <1215931622.15888.0.camel@alnilam> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Henrik Rydberg Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, dmitry.torokhov@gmail.com, robfitz@273k.net, akpm@linuxfoundation.org, jikos@jikos.cz, vojtech@suse.cz, dmonakhov@openvz.org On Sun, 13 Jul 2008 08:47:02 +0200 Henrik Rydberg wrote: > Subject: [PATCH] input: wellspring device quirks Actually this is a "hid" patch. Different subsystem, different maintainer. Confuses me all the time so I usually Cc both of them ;) > Date: Sun, 13 Jul 2008 08:47:02 +0200 > X-Mailer: Evolution 2.22.2 > > Content-Type: text/plain > Content-Transfer-Encoding: 7bit > Date: Sat, 12 Jul 2008 18:15:15 +0200 > Message-Id: <1215879315.13937.0.camel@alnilam> > > From: Henrik Rydberg > > This patch adds usbhid-quirks for the Apple USB multitouch devices > based on BCM5974, aka Wellspring. Quirks for these devices have already > been submitted by others; this patch adds the HID_QUIRK_IGNORE_MOUSE, > anticipating the trackpad to be picked up by the bcm5974 driver. > > Signed-off-by: Henrik Rydberg > --- > > diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c > index 1df832a..4dd11f4 100644 > --- a/drivers/hid/usbhid/hid-quirks.c > +++ b/drivers/hid/usbhid/hid-quirks.c > @@ -75,6 +75,12 @@ > #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI 0x022c > #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO 0x022d > #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS 0x022e > +#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI 0x0223 > +#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO 0x0224 > +#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS 0x0225 > +#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI 0x0230 > +#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO 0x0231 > +#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS 0x0232 > #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a > #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b > #define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242 > @@ -642,6 +648,12 @@ static const struct hid_blacklist { > { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, > { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, > { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, > + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, > + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE}, > + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, > + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, > + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD | HID_QUIRK_IGNORE_MOUSE }, > + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, > { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, > { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, Someone has already merged a patch which is similar or identical to this one. Please check linux-next and see if it needs fixups.