From 8b8f18ecc529716e07ef116020b0e7b49ce96ed8 Mon Sep 17 00:00:00 2001
From: Christoffer Sandberg <cs@tuxedo.de>
Date: Tue, 1 Aug 2023 14:30:08 +0200
Subject: [PATCH 1/2] uw: Add IBP16G8 mk1 romid quirk

---
 src/uniwill_keyboard.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/uniwill_keyboard.h b/src/uniwill_keyboard.h
index fb62732..30aba8c 100644
--- a/src/uniwill_keyboard.h
+++ b/src/uniwill_keyboard.h
@@ -977,14 +977,25 @@ static ssize_t uw_charging_prio_store(struct device *child,
 }
 
 static const u8 uw_romid_PH4PxX[14] = {0x0C, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
+static const u8 uw_romid_PH6PxX[14] = {0x0C, 0x01, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
 static const struct dmi_system_id uw_sku_romid_table[] = {
+	// Start IBPG8 mk1
+	// Logic: If product serial matches 16inch use that, else default to 14inch
+	{
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_SKU, "IBP1XI08MK1"),
+			DMI_MATCH(DMI_PRODUCT_SERIAL, "PH6PRX"),
+		},
+		.driver_data = (void *)&uw_romid_PH6PxX
+	},
 	{
 		.matches = {
 			DMI_MATCH(DMI_PRODUCT_SKU, "IBP1XI08MK1"),
 		},
 		.driver_data = (void *)&uw_romid_PH4PxX
 	},
+	// End IBPG8 mk1
 	{}
 };
 

From c3776fed99d3a64fbbcdac26d6ee2082bda1b9b5 Mon Sep 17 00:00:00 2001
From: Christoffer Sandberg <cs@tuxedo.de>
Date: Tue, 1 Aug 2023 18:24:05 +0200
Subject: [PATCH 2/2] uw: Add IBP16G8 mk2 romid quirk

---
 src/uniwill_keyboard.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/uniwill_keyboard.h b/src/uniwill_keyboard.h
index 30aba8c..07ed829 100644
--- a/src/uniwill_keyboard.h
+++ b/src/uniwill_keyboard.h
@@ -980,7 +980,7 @@ static const u8 uw_romid_PH4PxX[14] = {0x0C, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF,
 static const u8 uw_romid_PH6PxX[14] = {0x0C, 0x01, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
 static const struct dmi_system_id uw_sku_romid_table[] = {
-	// Start IBPG8 mk1
+	// IBPG8 mk1
 	// Logic: If product serial matches 16inch use that, else default to 14inch
 	{
 		.matches = {
@@ -995,7 +995,14 @@ static const struct dmi_system_id uw_sku_romid_table[] = {
 		},
 		.driver_data = (void *)&uw_romid_PH4PxX
 	},
-	// End IBPG8 mk1
+	// IBP16G8 mk2
+	{
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_SKU, "IBP1XI08MK2"),
+			DMI_MATCH(DMI_PRODUCT_SERIAL, "PH6"),
+		},
+		.driver_data = (void *)&uw_romid_PH6PxX
+	},
 	{}
 };