| From c4151b5ebd9fede2bc6cf75bad822e95cdf2906c Mon Sep 17 00:00:00 2001 |
| From: Nicolas Boichat <drinkcat@chromium.org> |
| Date: Thu, 3 Oct 2019 11:17:59 +0800 |
| Subject: [PATCH] HID: google: add magnemite/masterball USB ids |
| |
| commit 9e4dbc4646a84b2562ea7c64a542740687ff7daf upstream. |
| |
| Add 2 additional hammer-like devices. |
| |
| Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c |
| index ee5e0bdcf078..154f1ce771d5 100644 |
| --- a/drivers/hid/hid-google-hammer.c |
| +++ b/drivers/hid/hid-google-hammer.c |
| @@ -470,6 +470,10 @@ static const struct hid_device_id hammer_devices[] = { |
| { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, |
| USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_HAMMER) }, |
| { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, |
| + USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MAGNEMITE) }, |
| + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, |
| + USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_MASTERBALL) }, |
| + { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, |
| USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_STAFF) }, |
| { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, |
| USB_VENDOR_ID_GOOGLE, USB_DEVICE_ID_GOOGLE_WAND) }, |
| diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h |
| index 264139be7e29..0489c209a0b0 100644 |
| --- a/drivers/hid/hid-ids.h |
| +++ b/drivers/hid/hid-ids.h |
| @@ -475,6 +475,8 @@ |
| #define USB_DEVICE_ID_GOOGLE_STAFF 0x502b |
| #define USB_DEVICE_ID_GOOGLE_WAND 0x502d |
| #define USB_DEVICE_ID_GOOGLE_WHISKERS 0x5030 |
| +#define USB_DEVICE_ID_GOOGLE_MASTERBALL 0x503c |
| +#define USB_DEVICE_ID_GOOGLE_MAGNEMITE 0x503d |
| |
| #define USB_VENDOR_ID_GOTOP 0x08f2 |
| #define USB_DEVICE_ID_SUPER_Q2 0x007f |
| -- |
| 2.7.4 |
| |
