releases/3.1.1/hid-hid-apple-add-device-id-of-another-wireless-aluminium.patch

   1 From ad734bc1565364f9e4b70888d3ce5743b3c1030a Mon Sep 17 00:00:00 2001
   2 From: Andreas Krist <andreas.krist@gmail.com>
   3 Date: Fri, 28 Oct 2011 18:50:39 +0200
   4 Subject: HID: hid-apple: add device ID of another wireless aluminium
   5
   6 From: Andreas Krist <andreas.krist@gmail.com>
   7
   8 commit ad734bc1565364f9e4b70888d3ce5743b3c1030a upstream.
   9
  10 I've recently bought a Apple wireless aluminum keyboard (model 2011) which is
  11 not yet supported by the kernel - it seems they just changed the device id.
  12 After applying the attached patch, the device is fully functional.
  13
  14 Signed-off-by: Andreas Krist <andreas.krist@gmail.com>
  15 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17
  18 ---
  19  drivers/hid/hid-apple.c |    3 +++
  20  drivers/hid/hid-core.c  |    1 +
  21  drivers/hid/hid-ids.h   |    1 +
  22  3 files changed, 5 insertions(+)
  23
  24 --- a/drivers/hid/hid-apple.c
  25 +++ b/drivers/hid/hid-apple.c
  26 @@ -483,6 +483,9 @@ static const struct hid_device_id apple_
  27         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
  28                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
  29                         APPLE_ISO_KEYBOARD },
  30 +       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),
  31 +               .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
  32 +                       APPLE_ISO_KEYBOARD },
  33         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
  34                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
  35         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
  36 --- a/drivers/hid/hid-core.c
  37 +++ b/drivers/hid/hid-core.c
  38 @@ -1355,6 +1355,7 @@ static const struct hid_device_id hid_ha
  39         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
  40         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
  41         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
  42 +       { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },
  43         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
  44         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
  45         { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
  46 --- a/drivers/hid/hid-ids.h
  47 +++ b/drivers/hid/hid-ids.h
  48 @@ -124,6 +124,7 @@
  49  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239
  50  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
  51  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b
  52 +#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256
  53  #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY   0x030a
  54  #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY    0x030b
  55  #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL      0x8241