Commit 604530cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.17-4' of... 

Merge tag 'platform-drivers-x86-v6.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Ilpo Järvinen:
 "Fixes and new HW support:

   - amd/pmc: Add MECHREVO Yilong15Pro to spurious_8042 list

   - amd/pmf: Support new ACPI ID AMDI0108

   - asus-wmi: Re-add extra keys to ignore_key_wlan quirk

   - oxpec: Add support for AOKZOE A1X and OneXPlayer X1Pro EVA-02"

* tag 'platform-drivers-x86-v6.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: asus-wmi: Re-add extra keys to ignore_key_wlan quirk
  platform/x86/amd/pmf: Support new ACPI ID AMDI0108
  platform/x86: oxpec: Add support for AOKZOE A1X
  platform/x86: oxpec: Add support for OneXPlayer X1Pro EVA-02
  platform/x86/amd/pmc: Add MECHREVO Yilong15Pro to spurious_8042 list
parents f03e578c 225d1ee0

drivers/platform/x86/amd/pmc/pmc-quirks.c

+8 −0
Original line number Diff line number Diff line
@@ -239,6 +239,14 @@ static const struct dmi_system_id fwbug_list[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "WUJIE14-GX4HRXL"),

		}

	},

	{

		.ident = "MECHREVO Yilong15Pro Series GM5HG7A",

		.driver_data = &quirk_spurious_8042,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "MECHREVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Yilong15Pro Series GM5HG7A"),

		}

	},

	/* https://bugzilla.kernel.org/show_bug.cgi?id=220116 */

	{

		.ident = "PCSpecialist Lafite Pro V 14M",

drivers/platform/x86/amd/pmf/core.c

+1 −0
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ static const struct acpi_device_id amd_pmf_acpi_ids[] = { 
	{"AMDI0103", 0},

	{"AMDI0105", 0},

	{"AMDI0107", 0},

	{"AMDI0108", 0},

	{ }

};

MODULE_DEVICE_TABLE(acpi, amd_pmf_acpi_ids);

drivers/platform/x86/asus-nb-wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -673,6 +673,8 @@ static void asus_nb_wmi_key_filter(struct asus_wmi_driver *asus_wmi, int *code, 
		if (atkbd_reports_vol_keys)

			*code = ASUS_WMI_KEY_IGNORE;

		break;

	case 0x5D: /* Wireless console Toggle */

	case 0x5E: /* Wireless console Enable / Keyboard Attach, Detach */

	case 0x5F: /* Wireless console Disable / Special Key */

		if (quirks->key_wlan_event)

			*code = quirks->key_wlan_event;

drivers/platform/x86/oxpec.c

+14 −0
Original line number Diff line number Diff line
@@ -124,6 +124,13 @@ static const struct dmi_system_id dmi_table[] = { 
		},

		.driver_data = (void *)aok_zoe_a1,

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "AOKZOE"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "AOKZOE A1X"),

		},

		.driver_data = (void *)oxp_fly,

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
@@ -306,6 +313,13 @@ static const struct dmi_system_id dmi_table[] = { 
		},

		.driver_data = (void *)oxp_x1,

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),

			DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1Pro EVA-02"),

		},

		.driver_data = (void *)oxp_x1,

	},

	{},

};