Skip to content

Commit ccb98cc

Browse files
committed
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
2 parents fc033cf + 7e16ae5 commit ccb98cc

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

Documentation/admin-guide/laptops/thinkpad-acpi.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,10 @@ event code Key Notes
445445
0x1008 0x07 FN+F8 IBM: toggle screen expand
446446
Lenovo: configure UltraNav,
447447
or toggle screen expand.
448-
On newer platforms (2024+)
449-
replaced by 0x131f (see below)
448+
On 2024 platforms replaced by
449+
0x131f (see below) and on newer
450+
platforms (2025 +) keycode is
451+
replaced by 0x1401 (see below).
450452

451453
0x1009 0x08 FN+F9 -
452454

@@ -506,9 +508,11 @@ event code Key Notes
506508

507509
0x1019 0x18 unknown
508510

509-
0x131f ... FN+F8 Platform Mode change.
511+
0x131f ... FN+F8 Platform Mode change (2024 systems).
510512
Implemented in driver.
511513

514+
0x1401 ... FN+F8 Platform Mode change (2025 + systems).
515+
Implemented in driver.
512516
... ... ...
513517

514518
0x1020 0x1F unknown

drivers/platform/x86/hp/hp-wmi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ static const char * const omen_thermal_profile_boards[] = {
6464
"874A", "8603", "8604", "8748", "886B", "886C", "878A", "878B", "878C",
6565
"88C8", "88CB", "8786", "8787", "8788", "88D1", "88D2", "88F4", "88FD",
6666
"88F5", "88F6", "88F7", "88FE", "88FF", "8900", "8901", "8902", "8912",
67-
"8917", "8918", "8949", "894A", "89EB", "8BAD", "8A42"
67+
"8917", "8918", "8949", "894A", "89EB", "8BAD", "8A42", "8A15"
6868
};
6969

7070
/* 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[] = {
8080
* "balanced" when reaching zero.
8181
*/
8282
static const char * const omen_timed_thermal_profile_boards[] = {
83-
"8BAD", "8A42"
83+
"8BAD", "8A42", "8A15"
8484
};
8585

8686
/* DMI Board names of Victus laptops */

drivers/platform/x86/mlx-platform.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6237,6 +6237,7 @@ mlxplat_pci_fpga_device_init(unsigned int device, const char *res_name, struct p
62376237
fail_pci_request_regions:
62386238
pci_disable_device(pci_dev);
62396239
fail_pci_enable_device:
6240+
pci_dev_put(pci_dev);
62406241
return err;
62416242
}
62426243

@@ -6247,6 +6248,7 @@ mlxplat_pci_fpga_device_exit(struct pci_dev *pci_bridge,
62476248
iounmap(pci_bridge_addr);
62486249
pci_release_regions(pci_bridge);
62496250
pci_disable_device(pci_bridge);
6251+
pci_dev_put(pci_bridge);
62506252
}
62516253

62526254
static int

drivers/platform/x86/thinkpad_acpi.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ enum tpacpi_hkey_event_t {
184184
*/
185185
TP_HKEY_EV_AMT_TOGGLE = 0x131a, /* Toggle AMT on/off */
186186
TP_HKEY_EV_DOUBLETAP_TOGGLE = 0x131c, /* Toggle trackpoint doubletap on/off */
187-
TP_HKEY_EV_PROFILE_TOGGLE = 0x131f, /* Toggle platform profile */
187+
TP_HKEY_EV_PROFILE_TOGGLE = 0x131f, /* Toggle platform profile in 2024 systems */
188+
TP_HKEY_EV_PROFILE_TOGGLE2 = 0x1401, /* Toggle platform profile in 2025 + systems */
188189

189190
/* Reasons for waking up from S3/S4 */
190191
TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undock requested, S3 */
@@ -11200,6 +11201,7 @@ static bool tpacpi_driver_event(const unsigned int hkey_event)
1120011201
tp_features.trackpoint_doubletap = !tp_features.trackpoint_doubletap;
1120111202
return true;
1120211203
case TP_HKEY_EV_PROFILE_TOGGLE:
11204+
case TP_HKEY_EV_PROFILE_TOGGLE2:
1120311205
platform_profile_cycle();
1120411206
return true;
1120511207
}

0 commit comments

Comments
 (0)