Commit ab8beb20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'chrome-platform-for-6.13-rc5' of... 

Merge tag 'chrome-platform-for-6.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux

Pull chrome platform fix from Tzung-Bi Shih:

 - Fix wrong product names for early Framework Laptops

* tag 'chrome-platform-for-6.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_ec_lpc: fix product identity for early Framework Laptops
parents 9b2ffa61 dcd59d0d

drivers/platform/chrome/cros_ec_lpc.c

+2 −2
Original line number Diff line number Diff line
@@ -707,7 +707,7 @@ static const struct dmi_system_id cros_ec_lpc_dmi_table[] __initconst = { 
		/* Framework Laptop (12th Gen Intel Core) */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Framework"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "12th Gen Intel Core"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Laptop (12th Gen Intel Core)"),

		},

		.driver_data = (void *)&framework_laptop_mec_lpc_driver_data,

	},
@@ -715,7 +715,7 @@ static const struct dmi_system_id cros_ec_lpc_dmi_table[] __initconst = { 
		/* Framework Laptop (13th Gen Intel Core) */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Framework"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "13th Gen Intel Core"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Laptop (13th Gen Intel Core)"),

		},

		.driver_data = (void *)&framework_laptop_mec_lpc_driver_data,

	},