Re: [PATCH] input: wellspring device quirks

[Andrew Morton]

On Sun, 13 Jul 2008 08:47:02 +0200 Henrik Rydberg <rydberg@xxxxxxxxxxx> 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 <rydberg@xxxxxxxxxxx>
> 
> 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 <rydberg@xxxxxxxxxxx>
> ---
> 
> 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.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/