Commit 54de8b83 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v7.0-2' of... 

Merge tag 'platform-drivers-x86-v7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Ilpo Järvinen:

 - alienware-wmi-wmax: Add G-Mode support to m18 laptops

 - asus-armoury: Add support for FA401UM, G733QS, GX650RX

 - dell-wmi-sysman: Don't hex dump plaintext password data

 - hp-bioscfg: Support large number of enumeration attributes

 - hp-wmi: Add support for Omen 14-fb1xxx, 16-xd0xxx, 16-wf0xxx, and
   Victus-d0xxx

 - int3472: Handle GPIO type 0x10 (DOVDD)

 - intel-hid:
     - Add Dell 14 & 16 Plus 2-in-1 to dmi_vgbs_allow_list
     - Enable 5-button array on ThinkPad X1 Fold 16 Gen 1

 - mellanox: mlxreg: Fix kernel-doc warnings

 - oxpec: Add support for OneXPlayer X1 Air, X1z, APEX, and Aokzoe A2
   Pro

 - redmi-wmi: Add more Fn hotkey mappings

 - thinkpad_acpi: Fix errors reading battery thresholds

 - touchscreen_dmi: Add quirk for y-inverted Goodix touchscreen on SUPI
   S10

 - uniwill-laptop:
     - FN lock/super key lock attributes rename
     - Fix crash on unexpected battery event
     - A special key combination can alter FN lock status so mark it
       volatile
     - Handle FN lock event

* tag 'platform-drivers-x86-v7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (27 commits)
  platform/x86: dell-wmi-sysman: Don't hex dump plaintext password data
  platform_data/mlxreg: mlxreg.h: fix all kernel-doc warnings
  platform/x86: asus-armoury: add support for FA401UM
  platform/x86: asus-armoury: add support for GX650RX
  platform/x86: hp-bioscfg: Support allocations of larger data
  platform/x86: oxpec: Add support for Aokzoe A2 Pro
  platform/x86: oxpec: Add support for OneXPlayer X1 Air
  platform/x86: oxpec: Add support for OneXPlayer X1z
  platform/x86: oxpec: Add support for OneXPlayer APEX
  platform/x86: uniwill-laptop: Handle FN lock event
  platform/x86: uniwill-laptop: Mark FN lock status as being volatile
  platform/x86: uniwill-laptop: Fix crash on unexpected battery event
  platform/x86: uniwill-laptop: Rename FN lock and super key lock attrs
  platform/x86: redmi-wmi: Add more hotkey mappings
  platform/x86: alienware-wmi-wmax: Add G-Mode support to m18 laptops
  platform/x86: hp-wmi: add Omen 14-fb1xxx (board 8E41) support
  platform/x86: dell-wmi: Add audio/mic mute key codes
  platform/x86: hp-wmi: Add Victus 16-d0xxx support
  platform/x86: intel-hid: Enable 5-button array on ThinkPad X1 Fold 16 Gen 1
  platform/x86: int3472: Handle GPIO type 0x10 (DOVDD)
  ...
parents 9a881ea3 d1a196e0

Documentation/ABI/testing/sysfs-driver-uniwill-laptop

+5 −5
Original line number Diff line number Diff line 
What:		/sys/bus/platform/devices/INOU0000:XX/fn_lock_toggle_enable

What:		/sys/bus/platform/devices/INOU0000:XX/fn_lock

Date:		November 2025

KernelVersion:	6.19

Contact:	Armin Wolf <W_Armin@gmx.de>
@@ -8,15 +8,15 @@ Description: 


		Reading this file returns the current enable status of the FN lock functionality.



What:		/sys/bus/platform/devices/INOU0000:XX/super_key_toggle_enable

What:		/sys/bus/platform/devices/INOU0000:XX/super_key_enable

Date:		November 2025

KernelVersion:	6.19

Contact:	Armin Wolf <W_Armin@gmx.de>

Description:

                Allows userspace applications to enable/disable the super key functionality

                of the integrated keyboard by writing "1"/"0" into this file.

		Allows userspace applications to enable/disable the super key of the integrated

		keyboard by writing "1"/"0" into this file.



		Reading this file returns the current enable status of the super key functionality.

		Reading this file returns the current enable status of the super key.



What:		/sys/bus/platform/devices/INOU0000:XX/touchpad_toggle_enable

Date:		November 2025

Documentation/admin-guide/laptops/uniwill-laptop.rst

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Keyboard settings 


The ``uniwill-laptop`` driver allows the user to enable/disable:



 - the FN and super key lock functionality of the integrated keyboard

 - the FN lock and super key of the integrated keyboard

 - the touchpad toggle functionality of the integrated touchpad



See Documentation/ABI/testing/sysfs-driver-uniwill-laptop for details.

drivers/platform/x86/asus-armoury.h

+75 −0
Original line number Diff line number Diff line
@@ -346,6 +346,35 @@ struct power_data { 
 * _def is not required and will be assumed to be default == max if missing.

 */

static const struct dmi_system_id power_limits[] = {

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "FA401UM"),

		},

		.driver_data = &(struct power_data) {

			.ac_data = &(struct power_limits) {

				.ppt_pl1_spl_min = 15,

				.ppt_pl1_spl_max = 80,

				.ppt_pl2_sppt_min = 35,

				.ppt_pl2_sppt_max = 80,

				.ppt_pl3_fppt_min = 35,

				.ppt_pl3_fppt_max = 80,

				.nv_dynamic_boost_min = 5,

				.nv_dynamic_boost_max = 15,

				.nv_temp_target_min = 75,

				.nv_temp_target_max = 87,

			},

			.dc_data = &(struct power_limits) {

				.ppt_pl1_spl_min = 25,

				.ppt_pl1_spl_max = 35,

				.ppt_pl2_sppt_min = 31,

				.ppt_pl2_sppt_max = 44,

				.ppt_pl3_fppt_min = 45,

				.ppt_pl3_fppt_max = 65,

				.nv_temp_target_min = 75,

				.nv_temp_target_max = 87,

			},

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "FA401UV"),
@@ -1457,6 +1486,38 @@ static const struct dmi_system_id power_limits[] = { 
			},

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "GX650RX"),

		},

		.driver_data = &(struct power_data) {

			.ac_data = &(struct power_limits) {

				.ppt_pl1_spl_min = 28,

				.ppt_pl1_spl_def = 70,

				.ppt_pl1_spl_max = 90,

				.ppt_pl2_sppt_min = 28,

				.ppt_pl2_sppt_def = 70,

				.ppt_pl2_sppt_max = 100,

				.ppt_pl3_fppt_min = 28,

				.ppt_pl3_fppt_def = 110,

				.ppt_pl3_fppt_max = 125,

				.nv_dynamic_boost_min = 5,

				.nv_dynamic_boost_max = 25,

				.nv_temp_target_min = 76,

				.nv_temp_target_max = 87,

			},

			.dc_data = &(struct power_limits) {

				.ppt_pl1_spl_min = 28,

				.ppt_pl1_spl_max = 50,

				.ppt_pl2_sppt_min = 28,

				.ppt_pl2_sppt_max = 50,

				.ppt_pl3_fppt_min = 28,

				.ppt_pl3_fppt_max = 65,

				.nv_temp_target_min = 76,

				.nv_temp_target_max = 87,

			},

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "G513I"),
@@ -1708,6 +1769,20 @@ static const struct dmi_system_id power_limits[] = { 
			.requires_fan_curve = true,

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "G733QS"),

		},

		.driver_data = &(struct power_data) {

			.ac_data = &(struct power_limits) {

				.ppt_pl1_spl_min = 15,

				.ppt_pl1_spl_max = 80,

				.ppt_pl2_sppt_min = 15,

				.ppt_pl2_sppt_max = 80,

			},

			.requires_fan_curve = false,

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_BOARD_NAME, "G814J"),

drivers/platform/x86/dell/alienware-wmi-wmax.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static const struct dmi_system_id awcc_dmi_table[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Alienware m18"),

		},

		.driver_data = &generic_quirks,

		.driver_data = &g_series_quirks,

	},

	{

		.ident = "Alienware x15",

drivers/platform/x86/dell/dell-wmi-base.c

+6 −0
Original line number Diff line number Diff line
@@ -80,6 +80,12 @@ static const struct dmi_system_id dell_wmi_smbios_list[] __initconst = { 
static const struct key_entry dell_wmi_keymap_type_0000[] = {

	{ KE_IGNORE, 0x003a, { KEY_CAPSLOCK } },



	/* Audio mute toggle */

	{ KE_KEY,    0x0109, { KEY_MUTE } },



	/* Mic mute toggle */

	{ KE_KEY,    0x0150, { KEY_MICMUTE } },



	/* Meta key lock */

	{ KE_IGNORE, 0xe000, { KEY_RIGHTMETA } },