Merge branch 'ibpg8-romid-fixes' into 'master'

IBPG8 romid fixes

See merge request tuxedocomputers/development/packages/tuxedo-keyboard!64
This commit is contained in:
Christoffer 2023-08-01 17:24:21 +00:00
commit 07e64bdbae

View file

@ -977,14 +977,32 @@ 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_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[] = { static const struct dmi_system_id uw_sku_romid_table[] = {
// 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 = { .matches = {
DMI_MATCH(DMI_PRODUCT_SKU, "IBP1XI08MK1"), DMI_MATCH(DMI_PRODUCT_SKU, "IBP1XI08MK1"),
}, },
.driver_data = (void *)&uw_romid_PH4PxX .driver_data = (void *)&uw_romid_PH4PxX
}, },
// IBP16G8 mk2
{
.matches = {
DMI_MATCH(DMI_PRODUCT_SKU, "IBP1XI08MK2"),
DMI_MATCH(DMI_PRODUCT_SERIAL, "PH6"),
},
.driver_data = (void *)&uw_romid_PH6PxX
},
{} {}
}; };