releases/3.1.1/hid-add-device-ids-for-macbook-pro-8-keyboards.patch

   1 From 213f9da80533940560bef8fa43b10c590895459c Mon Sep 17 00:00:00 2001
   2 From: Gökçen Eraslan <gokcen@pardus.org.tr>
   3 Date: Sat, 22 Oct 2011 22:39:06 +0300
   4 Subject: HID: Add device IDs for Macbook Pro 8 keyboards
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 From: Gökçen Eraslan <gokcen@pardus.org.tr>
  10
  11 commit 213f9da80533940560bef8fa43b10c590895459c upstream.
  12
  13 This patch adds keyboard support for Macbook Pro 8 models which has
  14 WELLSPRING5A model name and 0x0252, 0x0253 and 0x0254 USB IDs. Trackpad
  15 support for those models are added to bcm5974 in
  16 c331eb580a0a7906c0cdb8dbae3cfe99e3c0e555 ("Input: bcm5974 - Add
  17 support for newer MacBookPro8,2).
  18
  19 Signed-off-by: Gökçen Eraslan <gokcen@pardus.org.tr>
  20 Acked-by: Henrik Rydberg <rydberg@euromail.se>
  21 Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  22 Cc: Chase Douglas <chase.douglas@canonical.com>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  24
  25 ---
  26  drivers/hid/hid-apple.c |    6 ++++++
  27  drivers/hid/hid-core.c  |    6 ++++++
  28  drivers/hid/hid-ids.h   |    3 +++
  29  3 files changed, 15 insertions(+)
  30
  31 --- a/drivers/hid/hid-apple.c
  32 +++ b/drivers/hid/hid-apple.c
  33 @@ -533,6 +533,12 @@ static const struct hid_device_id apple_
  34                 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
  35         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),
  36                 .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
  37 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),
  38 +               .driver_data = APPLE_HAS_FN },
  39 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),
  40 +               .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
  41 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),
  42 +               .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
  43         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
  44                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
  45         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
  46 --- a/drivers/hid/hid-core.c
  47 +++ b/drivers/hid/hid-core.c
  48 @@ -1340,6 +1340,9 @@ static const struct hid_device_id hid_ha
  49         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
  50         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
  51         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
  52 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
  53 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
  54 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
  55         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },
  56         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },
  57         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },
  58 @@ -1899,6 +1902,9 @@ static const struct hid_device_id hid_mo
  59         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
  60         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
  61         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
  62 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },
  63 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },
  64 +       { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },
  65         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
  66         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
  67         { }
  68 --- a/drivers/hid/hid-ids.h
  69 +++ b/drivers/hid/hid-ids.h
  70 @@ -118,6 +118,9 @@
  71  #define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI      0x024f
  72  #define USB_DEVICE_ID_APPLE_ALU_REVB_ISO       0x0250
  73  #define USB_DEVICE_ID_APPLE_ALU_REVB_JIS       0x0251
  74 +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI  0x0252
  75 +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO   0x0253
  76 +#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS   0x0254
  77  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239
  78  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a
  79  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b