Merge tag 'platform-drivers-x86-v6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
Pull x86 platform drivers fixes from Ilpo Järvinen: "hp-wmi: - mark 8A15 board for timed OMEN thermal profile mlx-platform: - call pci_dev_put() to balance the refcount thinkpad-acpi: - Add support for hotkey 0x1401" * tag 'platform-drivers-x86-v6.13-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: platform/x86: thinkpad-acpi: Add support for hotkey 0x1401 platform/x86: hp-wmi: mark 8A15 board for timed OMEN thermal profile platform/x86: mlx-platform: call pci_dev_put() to balance the refcount
This commit is contained in:
@@ -445,8 +445,10 @@ event code Key Notes
|
||||
0x1008 0x07 FN+F8 IBM: toggle screen expand
|
||||
Lenovo: configure UltraNav,
|
||||
or toggle screen expand.
|
||||
On newer platforms (2024+)
|
||||
replaced by 0x131f (see below)
|
||||
On 2024 platforms replaced by
|
||||
0x131f (see below) and on newer
|
||||
platforms (2025 +) keycode is
|
||||
replaced by 0x1401 (see below).
|
||||
|
||||
0x1009 0x08 FN+F9 -
|
||||
|
||||
@@ -506,9 +508,11 @@ event code Key Notes
|
||||
|
||||
0x1019 0x18 unknown
|
||||
|
||||
0x131f ... FN+F8 Platform Mode change.
|
||||
0x131f ... FN+F8 Platform Mode change (2024 systems).
|
||||
Implemented in driver.
|
||||
|
||||
0x1401 ... FN+F8 Platform Mode change (2025 + systems).
|
||||
Implemented in driver.
|
||||
... ... ...
|
||||
|
||||
0x1020 0x1F unknown
|
||||
|
||||
@@ -64,7 +64,7 @@ static const char * const omen_thermal_profile_boards[] = {
|
||||
"874A", "8603", "8604", "8748", "886B", "886C", "878A", "878B", "878C",
|
||||
"88C8", "88CB", "8786", "8787", "8788", "88D1", "88D2", "88F4", "88FD",
|
||||
"88F5", "88F6", "88F7", "88FE", "88FF", "8900", "8901", "8902", "8912",
|
||||
"8917", "8918", "8949", "894A", "89EB", "8BAD", "8A42"
|
||||
"8917", "8918", "8949", "894A", "89EB", "8BAD", "8A42", "8A15"
|
||||
};
|
||||
|
||||
/* DMI Board names of Omen laptops that are specifically set to be thermal
|
||||
@@ -80,7 +80,7 @@ static const char * const omen_thermal_profile_force_v0_boards[] = {
|
||||
* "balanced" when reaching zero.
|
||||
*/
|
||||
static const char * const omen_timed_thermal_profile_boards[] = {
|
||||
"8BAD", "8A42"
|
||||
"8BAD", "8A42", "8A15"
|
||||
};
|
||||
|
||||
/* DMI Board names of Victus laptops */
|
||||
|
||||
@@ -6237,6 +6237,7 @@ fail_pci_set_dma_mask:
|
||||
fail_pci_request_regions:
|
||||
pci_disable_device(pci_dev);
|
||||
fail_pci_enable_device:
|
||||
pci_dev_put(pci_dev);
|
||||
return err;
|
||||
}
|
||||
|
||||
@@ -6247,6 +6248,7 @@ mlxplat_pci_fpga_device_exit(struct pci_dev *pci_bridge,
|
||||
iounmap(pci_bridge_addr);
|
||||
pci_release_regions(pci_bridge);
|
||||
pci_disable_device(pci_bridge);
|
||||
pci_dev_put(pci_bridge);
|
||||
}
|
||||
|
||||
static int
|
||||
|
||||
@@ -184,7 +184,8 @@ enum tpacpi_hkey_event_t {
|
||||
*/
|
||||
TP_HKEY_EV_AMT_TOGGLE = 0x131a, /* Toggle AMT on/off */
|
||||
TP_HKEY_EV_DOUBLETAP_TOGGLE = 0x131c, /* Toggle trackpoint doubletap on/off */
|
||||
TP_HKEY_EV_PROFILE_TOGGLE = 0x131f, /* Toggle platform profile */
|
||||
TP_HKEY_EV_PROFILE_TOGGLE = 0x131f, /* Toggle platform profile in 2024 systems */
|
||||
TP_HKEY_EV_PROFILE_TOGGLE2 = 0x1401, /* Toggle platform profile in 2025 + systems */
|
||||
|
||||
/* Reasons for waking up from S3/S4 */
|
||||
TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undock requested, S3 */
|
||||
@@ -11200,6 +11201,7 @@ static bool tpacpi_driver_event(const unsigned int hkey_event)
|
||||
tp_features.trackpoint_doubletap = !tp_features.trackpoint_doubletap;
|
||||
return true;
|
||||
case TP_HKEY_EV_PROFILE_TOGGLE:
|
||||
case TP_HKEY_EV_PROFILE_TOGGLE2:
|
||||
platform_profile_cycle();
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user