Commit 9887e9af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v5.11-2' of... 

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

Pull x86 platform driver fixes from Hans de Goede:
 "A small collection of bug-fixes and model-specific quirks"

* tag 'platform-drivers-x86-v5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: thinkpad_acpi: Add P53/73 firmware to fan_quirk_table for dual fan control
  platform/x86: hp-wmi: Don't log a warning on HPWMI_RET_UNKNOWN_COMMAND errors
  platform/x86: intel-vbtn: Drop HP Stream x360 Convertible PC 11 from allow-list
  platform/x86: ideapad-laptop: Disable touchpad_switch for ELAN0634
  platform/x86: amd-pmc: Fix CONFIG_DEBUG_FS check
  platform/x86: thinkpad_acpi: correct palmsensor error checking
  platform/x86: intel-vbtn: Support for tablet mode on Dell Inspiron 7352
  platform/x86: touchscreen_dmi: Add swap-x-y quirk for Goodix touchscreen on Estar Beauty HD tablet
  platform/x86: i2c-multi-instantiate: Don't create platform device for INT3515 ACPI nodes
  platform/surface: SURFACE_PLATFORMS should depend on ACPI
  platform/surface: surface_gpe: Fix non-PM_SLEEP build warnings
  tools/power/x86/intel-speed-select: Set higher of cpuinfo_max_freq or base_frequency
  tools/power/x86/intel-speed-select: Set scaling_max_freq to base_frequency
parents 83d09ad4 173aac2f

drivers/platform/surface/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


menuconfig SURFACE_PLATFORMS

	bool "Microsoft Surface Platform-Specific Device Drivers"

	depends on ACPI

	default y

	help

	  Say Y here to get to see options for platform-specific device drivers
@@ -29,20 +30,19 @@ config SURFACE3_WMI 


config SURFACE_3_BUTTON

	tristate "Power/home/volume buttons driver for Microsoft Surface 3 tablet"

	depends on ACPI && KEYBOARD_GPIO && I2C

	depends on KEYBOARD_GPIO && I2C

	help

	  This driver handles the power/home/volume buttons on the Microsoft Surface 3 tablet.



config SURFACE_3_POWER_OPREGION

	tristate "Surface 3 battery platform operation region support"

	depends on ACPI && I2C

	depends on I2C

	help

	  This driver provides support for ACPI operation

	  region of the Surface 3 battery platform driver.



config SURFACE_GPE

	tristate "Surface GPE/Lid Support Driver"

	depends on ACPI

	depends on DMI

	help

	  This driver marks the GPEs related to the ACPI lid device found on
@@ -52,7 +52,7 @@ config SURFACE_GPE 


config SURFACE_PRO3_BUTTON

	tristate "Power/home/volume buttons driver for Microsoft Surface Pro 3/4 tablet"

	depends on ACPI && INPUT

	depends on INPUT

	help

	  This driver handles the power/home/volume buttons on the Microsoft Surface Pro 3/4 tablet.

drivers/platform/surface/surface_gpe.c

+2 −2
Original line number Diff line number Diff line
@@ -181,12 +181,12 @@ static int surface_lid_enable_wakeup(struct device *dev, bool enable) 
	return 0;

}



static int surface_gpe_suspend(struct device *dev)

static int __maybe_unused surface_gpe_suspend(struct device *dev)

{

	return surface_lid_enable_wakeup(dev, true);

}



static int surface_gpe_resume(struct device *dev)

static int __maybe_unused surface_gpe_resume(struct device *dev)

{

	return surface_lid_enable_wakeup(dev, false);

}

drivers/platform/x86/amd-pmc.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static inline void amd_pmc_reg_write(struct amd_pmc_dev *dev, int reg_offset, u3 
	iowrite32(val, dev->regbase + reg_offset);

}



#if CONFIG_DEBUG_FS

#ifdef CONFIG_DEBUG_FS

static int smu_fw_info_show(struct seq_file *s, void *unused)

{

	struct amd_pmc_dev *dev = s->private;

drivers/platform/x86/hp-wmi.c

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ static int hp_wmi_perform_query(int query, enum hp_wmi_command command, 
	ret = bios_return->return_code;



	if (ret) {

		if (ret != HPWMI_RET_UNKNOWN_CMDTYPE)

		if (ret != HPWMI_RET_UNKNOWN_COMMAND &&

		    ret != HPWMI_RET_UNKNOWN_CMDTYPE)

			pr_warn("query 0x%x returned error 0x%x\n", query, ret);

		goto out_free;

	}

drivers/platform/x86/i2c-multi-instantiate.c

+23 −8
Original line number Diff line number Diff line
@@ -164,13 +164,29 @@ static const struct i2c_inst_data bsg2150_data[] = { 
	{}

};



static const struct i2c_inst_data int3515_data[]  = {

	{ "tps6598x", IRQ_RESOURCE_APIC, 0 },

	{ "tps6598x", IRQ_RESOURCE_APIC, 1 },

	{ "tps6598x", IRQ_RESOURCE_APIC, 2 },

	{ "tps6598x", IRQ_RESOURCE_APIC, 3 },

	{}

};

/*

 * Device with _HID INT3515 (TI PD controllers) has some unresolved interrupt

 * issues. The most common problem seen is interrupt flood.

 *

 * There are at least two known causes. Firstly, on some boards, the

 * I2CSerialBus resource index does not match the Interrupt resource, i.e. they

 * are not one-to-one mapped like in the array below. Secondly, on some boards

 * the IRQ line from the PD controller is not actually connected at all. But the

 * interrupt flood is also seen on some boards where those are not a problem, so

 * there are some other problems as well.

 *

 * Because of the issues with the interrupt, the device is disabled for now. If

 * you wish to debug the issues, uncomment the below, and add an entry for the

 * INT3515 device to the i2c_multi_instance_ids table.

 *

 * static const struct i2c_inst_data int3515_data[]  = {

 *	{ "tps6598x", IRQ_RESOURCE_APIC, 0 },

 *	{ "tps6598x", IRQ_RESOURCE_APIC, 1 },

 *	{ "tps6598x", IRQ_RESOURCE_APIC, 2 },

 *	{ "tps6598x", IRQ_RESOURCE_APIC, 3 },

 *	{ }

 * };

 */



/*

 * Note new device-ids must also be added to i2c_multi_instantiate_ids in
@@ -179,7 +195,6 @@ static const struct i2c_inst_data int3515_data[] = { 
static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = {

	{ "BSG1160", (unsigned long)bsg1160_data },

	{ "BSG2150", (unsigned long)bsg2150_data },

	{ "INT3515", (unsigned long)int3515_data },

	{ }

};

MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids);