From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Henrik Rydberg <rydberg@bitmath.org>
Subject: Re: [PATCH 2/3] HID: apple: Add support for the 2015 Macbook Pro
Date: Fri, 24 Jul 2015 10:54:44 -0700 [thread overview]
Message-ID: <20150724175444.GC2872@dtor-ws> (raw)
In-Reply-To: <1437759260-7748-2-git-send-email-rydberg@bitmath.org>
On Fri, Jul 24, 2015 at 07:34:19PM +0200, Henrik Rydberg wrote:
> This patch adds keyboard support for MacbookPro12,1 as WELLSPRING9
> (0x0272, 0x0273, 0x0274). The touchpad is handled in a separate
> bcm5974 patch, as usual.
>
> Tested-by: John Horan <knasher@gmail.com>
> Tested-by: Jochen Radmacher <jradmacher@gmx.de>
> Tested-by: Yang Hongyang <burnef@gmail.com>
> Tested-by: Yen-Chin, Lee <coldnew.tw@gmail.com>
> Tested-by: George Hilios <ghilios@gmail.com>
> Tested-by: Janez Urevc <janez@janezurevc.name>
> Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
Jiri, do you think I can take all three in through my tree? I think it
might be worthwhile to get the changes in 4.2 still.
> ---
> drivers/hid/hid-apple.c | 6 ++++++
> drivers/hid/hid-core.c | 6 ++++++
> drivers/hid/hid-ids.h | 3 +++
> 3 files changed, 15 insertions(+)
>
> diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
> index f822fd2..884d82f 100644
> --- a/drivers/hid/hid-apple.c
> +++ b/drivers/hid/hid-apple.c
> @@ -546,6 +546,12 @@ static const struct hid_device_id apple_devices[] = {
> .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS),
> .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI),
> + .driver_data = APPLE_HAS_FN },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO),
> + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS),
> + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
> .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
> index 157c627..e6fce23 100644
> --- a/drivers/hid/hid-core.c
> +++ b/drivers/hid/hid-core.c
> @@ -1782,6 +1782,9 @@ static const struct hid_device_id hid_have_special_driver[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI) },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO) },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
> @@ -2463,6 +2466,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = {
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI) },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_ISO) },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING8_JIS) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_ISO) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING9_JIS) },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
> { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
> { }
> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
> index b04b082..b3b225b 100644
> --- a/drivers/hid/hid-ids.h
> +++ b/drivers/hid/hid-ids.h
> @@ -142,6 +142,9 @@
> #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290
> #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291
> #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292
> +#define USB_DEVICE_ID_APPLE_WELLSPRING9_ANSI 0x0272
> +#define USB_DEVICE_ID_APPLE_WELLSPRING9_ISO 0x0273
> +#define USB_DEVICE_ID_APPLE_WELLSPRING9_JIS 0x0274
> #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
> #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
> #define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240
> --
> 2.4.5
>
--
Dmitry
next prev parent reply other threads:[~2015-07-24 17:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-24 17:34 [PATCH 1/3] Input: bcm5974 - Prepare for a new trackpad generation Henrik Rydberg
2015-07-24 17:34 ` [PATCH 2/3] HID: apple: Add support for the 2015 Macbook Pro Henrik Rydberg
2015-07-24 17:54 ` Dmitry Torokhov [this message]
2015-07-24 18:29 ` Jiri Kosina
2015-07-24 17:34 ` [PATCH 3/3] Input: bcm597 - " Henrik Rydberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150724175444.GC2872@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rydberg@bitmath.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).