Commit ed472919 authored Oct 12, 2021 by Linus Torvalds

Merge tag 'platform-drivers-x86-v5.15-3' of...

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

Pull x86 platform driver fixes from Hans de Goede:
 "A second (small) set of pdx86 bug-fixes and new hardware ids for 5.15"

* tag 'platform-drivers-x86-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: int1092: Fix non sequential device mode handling
  platform/x86: intel_skl_int3472: Correct null check
  platform/x86: gigabyte-wmi: add support for B550 AORUS ELITE AX V2
  platform/x86: amd-pmc: Add alternative acpi id for PMC controller
  platform/x86: intel_scu_ipc: Update timeout value in comment
  platform/x86: intel_scu_ipc: Increase virtual timeout to 10s
  platform/x86: intel_scu_ipc: Fix busy loop expiry time
  platform/x86: dell: Make DELL_WMI_PRIVACY depend on DELL_WMI
  platform/mellanox: mlxreg-io: Fix read access of n-bytes size attributes
  platform/mellanox: mlxreg-io: Fix argument base in kstrtou32() call

parents fa587876 7df22784

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -9307,7 +9307,7 @@ S: Maintained
		F: drivers/platform/x86/intel/atomisp2/led.c

		INTEL BIOS SAR INT1092 DRIVER
		M: Shravan S <s.shravan@intel.com>
		M: Shravan Sudhakar <s.shravan@intel.com>
		M: Intel Corporation <linuxwwan@intel.com>
		L: platform-driver-x86@vger.kernel.org
		S: Maintained

drivers/platform/mellanox/mlxreg-io.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ mlxreg_io_get_reg(void regmap, struct mlxreg_core_data data, u32 in_val,
		if (ret)
		goto access_error;

		regval \|= rol32(val, regsize i);
		regval \|= rol32(val, regsize i * 8);
		}
		}

		@@ -141,7 +141,7 @@ mlxreg_io_attr_store(struct device dev, struct device_attribute attr,
		return -EINVAL;

		/* Convert buffer to input value. */
		ret = kstrtou32(buf, len, &input_val);
		ret = kstrtou32(buf, 0, &input_val);
		if (ret)
		return ret;

drivers/platform/x86/amd-pmc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -476,6 +476,7 @@ static const struct acpi_device_id amd_pmc_acpi_ids[] = {
		{"AMDI0006", 0},
		{"AMDI0007", 0},
		{"AMD0004", 0},
		{"AMD0005", 0},
		{ }
		};
		MODULE_DEVICE_TABLE(acpi, amd_pmc_acpi_ids);

drivers/platform/x86/dell/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ config DELL_WMI
		config DELL_WMI_PRIVACY
		bool "Dell WMI Hardware Privacy Support"
		depends on LEDS_TRIGGER_AUDIO = y \|\| DELL_WMI = LEDS_TRIGGER_AUDIO
		depends on DELL_WMI
		help
		This option adds integration with the "Dell Hardware Privacy"
		feature of Dell laptops to the dell-wmi driver.

drivers/platform/x86/gigabyte-wmi.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,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 AX 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"),