diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/platform/x86/asus-nb-wmi.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/platform/x86/asus-nb-wmi.c')
| -rw-r--r-- | drivers/platform/x86/asus-nb-wmi.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index cb15acdf14a3..fdf7da06af30 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -464,7 +464,8 @@ static const struct dmi_system_id asus_quirks[] = {  		.ident = "ASUS ROG FLOW X13",  		.matches = {  			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), -			DMI_MATCH(DMI_PRODUCT_NAME, "GV301Q"), +			/* Match GV301** */ +			DMI_MATCH(DMI_PRODUCT_NAME, "GV301"),  		},  		.driver_data = &quirk_asus_tablet_mode,  	}, @@ -554,6 +555,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = {  	{ KE_KEY, 0x71, { KEY_F13 } }, /* General-purpose button */  	{ KE_IGNORE, 0x79, },  /* Charger type dectection notification */  	{ KE_KEY, 0x7a, { KEY_ALS_TOGGLE } }, /* Ambient Light Sensor Toggle */ +	{ KE_IGNORE, 0x7B, }, /* Charger connect/disconnect notification */  	{ KE_KEY, 0x7c, { KEY_MICMUTE } },  	{ KE_KEY, 0x7D, { KEY_BLUETOOTH } }, /* Bluetooth Enable */  	{ KE_KEY, 0x7E, { KEY_BLUETOOTH } }, /* Bluetooth Disable */ @@ -583,6 +585,7 @@ static const struct key_entry asus_nb_wmi_keymap[] = {  	{ KE_KEY, 0xAE, { KEY_FN_F5 } }, /* Fn+F5 fan mode on 2020+ */  	{ KE_KEY, 0xB3, { KEY_PROG4 } }, /* AURA */  	{ KE_KEY, 0xB5, { KEY_CALC } }, +	{ KE_IGNORE, 0xC0, }, /* External display connect/disconnect notification */  	{ KE_KEY, 0xC4, { KEY_KBDILLUMUP } },  	{ KE_KEY, 0xC5, { KEY_KBDILLUMDOWN } },  	{ KE_IGNORE, 0xC6, },  /* Ambient Light Sensor notification */  |