platform/chrome: cros_ec_lpc: switch primary DMI data for Framework Laptop

Framework Computer appears to be moving away from the Microchip embedded
controller seen in the Framework Laptop 13 with Intel Core 11th, 12th
and 13th generation processors. All newer models use a Nuvoton NPCX
embedded controller.

Changing the default DMI match for Framework's products to match their
newer product lines will reduce churn in this part of the cros_ec_lpc
driver.

The new match tables are:

- Microchip EC models
  - "Laptop" (product, exact match) for the 11th gen. Intel Core
  - "12th Gen Intel Core" (product, exact match)
  - "13th Gen Intel Core" (product, exact match)
- Nuvoton NPCX models
  - "Laptop" (product family, partial match)

Signed-off-by: Dustin L. Howett <dustin@howett.net>
Reviewed-by: Alexandru M Stan <ams@frame.work>
Link: https://lore.kernel.org/r/20240806-platform-chrome-cros_ec_lpcs-change-the-default-disposition-of-the-framework-laptop-v1-1-09e0d602b215@howett.net
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>

diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c
index f0470248b109872939463868910d221f1b855591..c784119ab5dc0c68d3339929cdb798e1fe10714d 100644 (file)
--- a/drivers/platform/chrome/cros_ec_lpc.c
+++ b/drivers/platform/chrome/cros_ec_lpc.c
@@ -631,12 +631,12 @@ static const struct acpi_device_id cros_ec_lpc_acpi_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, cros_ec_lpc_acpi_device_ids);
 
-static const struct lpc_driver_data framework_laptop_amd_lpc_driver_data __initconst = {
+static const struct lpc_driver_data framework_laptop_npcx_lpc_driver_data __initconst = {
        .quirks = CROS_EC_LPC_QUIRK_REMAP_MEMORY,
        .quirk_mmio_memory_base = 0xE00,
 };
 
-static const struct lpc_driver_data framework_laptop_11_lpc_driver_data __initconst = {
+static const struct lpc_driver_data framework_laptop_mec_lpc_driver_data __initconst = {
        .quirks = CROS_EC_LPC_QUIRK_ACPI_ID|CROS_EC_LPC_QUIRK_AML_MUTEX,
        .quirk_acpi_id = "PNP0C09",
        .quirk_aml_mutex_name = "ECMT",
@@ -696,21 +696,39 @@ static const struct dmi_system_id cros_ec_lpc_dmi_table[] __initconst = {
        },
        /* A small number of non-Chromebook/box machines also use the ChromeOS EC */
        {
-               /* the Framework Laptop 13 (AMD Ryzen) and 16 (AMD Ryzen) */
+               /* Framework Laptop (11th Gen Intel Core) */
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Framework"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "AMD Ryzen"),
-                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Laptop"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Laptop"),
+               },
+               .driver_data = (void *)&framework_laptop_mec_lpc_driver_data,
+       },
+       {
+               /* Framework Laptop (12th Gen Intel Core) */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Framework"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "12th Gen Intel Core"),
+               },
+               .driver_data = (void *)&framework_laptop_mec_lpc_driver_data,
+       },
+       {
+               /* Framework Laptop (13th Gen Intel Core) */
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Framework"),
+                       DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "13th Gen Intel Core"),
                },
-               .driver_data = (void *)&framework_laptop_amd_lpc_driver_data,
+               .driver_data = (void *)&framework_laptop_mec_lpc_driver_data,
        },
        {
-               /* the Framework Laptop (Intel 11th, 12th, 13th Generation) */
+               /*
+                * All remaining Framework Laptop models (13 AMD Ryzen, 16 AMD
+                * Ryzen, Intel Core Ultra)
+                */
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Framework"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Laptop"),
+                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Laptop"),
                },
-               .driver_data = (void *)&framework_laptop_11_lpc_driver_data,
+               .driver_data = (void *)&framework_laptop_npcx_lpc_driver_data,
        },
        { /* sentinel */ }
 };