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

Merge tag 'platform-drivers-x86-v5.14-4' of... 

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

Pull x86 platform driver fixes from Hans de Goede:

 - Enable SW_TABLET_MODE support for the TP200s

 - Enable WMI on two more Gigabyte motherboards

* tag 'platform-drivers-x86-v5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: gigabyte-wmi: add support for B450M S2H V2
  platform/x86: gigabyte-wmi: add support for X570 GAMING X
  platform/x86: asus-nb-wmi: Add tablet_mode_sw=lid-flip quirk for the TP200s
  platform/x86: asus-nb-wmi: Allow configuring SW_TABLET_MODE method with a module option
parents d6d09a69 1e35b8a7

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

+28 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ static int wapf = -1; 
module_param(wapf, uint, 0444);

MODULE_PARM_DESC(wapf, "WAPF value");



static int tablet_mode_sw = -1;

module_param(tablet_mode_sw, uint, 0444);

MODULE_PARM_DESC(tablet_mode_sw, "Tablet mode detect: -1:auto 0:disable 1:kbd-dock 2:lid-flip");



static struct quirk_entry *quirks;



static bool asus_q500a_i8042_filter(unsigned char data, unsigned char str,
@@ -458,6 +462,15 @@ static const struct dmi_system_id asus_quirks[] = { 
		},

		.driver_data = &quirk_asus_use_lid_flip_devid,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUS TP200s / E205SA",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "E205SA"),

		},

		.driver_data = &quirk_asus_use_lid_flip_devid,

	},

	{},

};
@@ -477,6 +490,21 @@ static void asus_nb_wmi_quirks(struct asus_wmi_driver *driver) 
	else

		wapf = quirks->wapf;



	switch (tablet_mode_sw) {

	case 0:

		quirks->use_kbd_dock_devid = false;

		quirks->use_lid_flip_devid = false;

		break;

	case 1:

		quirks->use_kbd_dock_devid = true;

		quirks->use_lid_flip_devid = false;

		break;

	case 2:

		quirks->use_kbd_dock_devid = false;

		quirks->use_lid_flip_devid = true;

		break;

	}



	if (quirks->i8042_filter) {

		ret = i8042_install_filter(quirks->i8042_filter);

		if (ret) {

drivers/platform/x86/gigabyte-wmi.c

+2 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ static u8 gigabyte_wmi_detect_sensor_usability(struct wmi_device *wdev) 
	}}



static const struct dmi_system_id gigabyte_wmi_known_working_platforms[] = {

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B450M S2H V2"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 AORUS ELITE V2"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550 GAMING X V2"),
@@ -147,6 +148,7 @@ static const struct dmi_system_id gigabyte_wmi_known_working_platforms[] = { 
	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("B550M DS3H"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("Z390 I AORUS PRO WIFI-CF"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("X570 AORUS ELITE"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("X570 GAMING X"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("X570 I AORUS PRO WIFI"),

	DMI_EXACT_MATCH_GIGABYTE_BOARD_NAME("X570 UD"),

	{ }