Skip to content

Commit 604530c

Browse files
committed
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
2 parents f03e578 + 225d1ee commit 604530c

File tree

4 files changed

+25
-0
lines changed

4 files changed

+25
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,14 @@ static const struct dmi_system_id fwbug_list[] = {
239239
DMI_MATCH(DMI_BOARD_NAME, "WUJIE14-GX4HRXL"),
240240
}
241241
},
242+
{
243+
.ident = "MECHREVO Yilong15Pro Series GM5HG7A",
244+
.driver_data = &quirk_spurious_8042,
245+
.matches = {
246+
DMI_MATCH(DMI_SYS_VENDOR, "MECHREVO"),
247+
DMI_MATCH(DMI_PRODUCT_NAME, "Yilong15Pro Series GM5HG7A"),
248+
}
249+
},
242250
/* https://bugzilla.kernel.org/show_bug.cgi?id=220116 */
243251
{
244252
.ident = "PCSpecialist Lafite Pro V 14M",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ static const struct acpi_device_id amd_pmf_acpi_ids[] = {
403403
{"AMDI0103", 0},
404404
{"AMDI0105", 0},
405405
{"AMDI0107", 0},
406+
{"AMDI0108", 0},
406407
{ }
407408
};
408409
MODULE_DEVICE_TABLE(acpi, amd_pmf_acpi_ids);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,8 @@ static void asus_nb_wmi_key_filter(struct asus_wmi_driver *asus_wmi, int *code,
673673
if (atkbd_reports_vol_keys)
674674
*code = ASUS_WMI_KEY_IGNORE;
675675
break;
676+
case 0x5D: /* Wireless console Toggle */
677+
case 0x5E: /* Wireless console Enable / Keyboard Attach, Detach */
676678
case 0x5F: /* Wireless console Disable / Special Key */
677679
if (quirks->key_wlan_event)
678680
*code = quirks->key_wlan_event;

drivers/platform/x86/oxpec.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@ static const struct dmi_system_id dmi_table[] = {
124124
},
125125
.driver_data = (void *)aok_zoe_a1,
126126
},
127+
{
128+
.matches = {
129+
DMI_MATCH(DMI_BOARD_VENDOR, "AOKZOE"),
130+
DMI_EXACT_MATCH(DMI_BOARD_NAME, "AOKZOE A1X"),
131+
},
132+
.driver_data = (void *)oxp_fly,
133+
},
127134
{
128135
.matches = {
129136
DMI_MATCH(DMI_BOARD_VENDOR, "AYANEO"),
@@ -306,6 +313,13 @@ static const struct dmi_system_id dmi_table[] = {
306313
},
307314
.driver_data = (void *)oxp_x1,
308315
},
316+
{
317+
.matches = {
318+
DMI_MATCH(DMI_BOARD_VENDOR, "ONE-NETBOOK"),
319+
DMI_EXACT_MATCH(DMI_BOARD_NAME, "ONEXPLAYER X1Pro EVA-02"),
320+
},
321+
.driver_data = (void *)oxp_x1,
322+
},
309323
{},
310324
};
311325

0 commit comments

Comments
 (0)