[PATCH] HID: sony: add second device IDs to CRKD Gibson SG

[Rosalie Wanders]

CRKD changed the product IDs in a firmware revision, yet the dongle
doesn't have these ID changes included yet but will have them included
in a future firmware revision.

CRKD also doesn't allow the firmware to be updated on Linux so having
both the old and new product IDs is necessary.

Signed-off-by: Rosalie Wanders <rosalie@xxxxxxxxxxx>
---
 drivers/hid/hid-ids.h  | 6 ++++--
 drivers/hid/hid-sony.c | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 43f86061cab2..cdf69ce86d99 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -364,8 +364,10 @@
 #define USB_DEVICE_ID_CREATIVE_SB0540	0x3100
 
 #define USB_VENDOR_ID_CRKD	0x3651
-#define USB_DEVICE_ID_CRKD_PS4_GIBSON_SG	0x1500
-#define USB_DEVICE_ID_CRKD_PS5_GIBSON_SG	0x1600
+#define USB_DEVICE_ID_CRKD_PS4_GIBSON_SG_1	0x5500
+#define USB_DEVICE_ID_CRKD_PS4_GIBSON_SG_2	0x1500
+#define USB_DEVICE_ID_CRKD_PS5_GIBSON_SG_1	0x5600
+#define USB_DEVICE_ID_CRKD_PS5_GIBSON_SG_2	0x1600
 
 #define USB_VENDOR_ID_CVTOUCH		0x1ff7
 #define USB_DEVICE_ID_CVTOUCH_SCREEN	0x0013
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index d0270ffec4f4..ad73de5cb627 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2381,7 +2381,9 @@ static const struct hid_device_id sony_devices[] = {
 	/* Rock Band 4 PS4 guitars */
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PDP, USB_DEVICE_ID_PDP_PS4_RIFFMASTER),
 		.driver_data = RB4_GUITAR_PS4_USB },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_CRKD, USB_DEVICE_ID_CRKD_PS4_GIBSON_SG),
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CRKD, USB_DEVICE_ID_CRKD_PS4_GIBSON_SG_1),
+		.driver_data = RB4_GUITAR_PS4_USB },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CRKD, USB_DEVICE_ID_CRKD_PS4_GIBSON_SG_2),
 		.driver_data = RB4_GUITAR_PS4_USB },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_PDP, USB_DEVICE_ID_PDP_PS4_JAGUAR),
 		.driver_data = RB4_GUITAR_PS4_BT },
@@ -2390,7 +2392,9 @@ static const struct hid_device_id sony_devices[] = {
 	/* Rock Band 4 PS5 guitars */
 	{ HID_USB_DEVICE(USB_VENDOR_ID_PDP, USB_DEVICE_ID_PDP_PS5_RIFFMASTER),
 		.driver_data = RB4_GUITAR_PS5 },
-	{ HID_USB_DEVICE(USB_VENDOR_ID_CRKD, USB_DEVICE_ID_CRKD_PS5_GIBSON_SG),
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CRKD, USB_DEVICE_ID_CRKD_PS5_GIBSON_SG_1),
+		.driver_data = RB4_GUITAR_PS5 },
+	{ HID_USB_DEVICE(USB_VENDOR_ID_CRKD, USB_DEVICE_ID_CRKD_PS5_GIBSON_SG_2),
 		.driver_data = RB4_GUITAR_PS5 },
 	{ }
 };
-- 
2.52.0