Unverified Commit 594f9cce authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge branch 'fixes' of into for-next 

The current set of DMI board IDs from the fixes branch is required to
reorder them in the for-next branch.
parents b169e173 9b9c0adb

Documentation/wmi/driver-development-guide.rst

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ to matching WMI devices using a struct wmi_device_id table: 
::



  static const struct wmi_device_id foo_id_table[] = {

         /* Only use uppercase letters! */

         { "936DA01F-9ABD-4D9D-80C7-02AF85C822A8", NULL },

         { }

  };

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -3841,6 +3841,7 @@ F: drivers/hwmon/asus-ec-sensors.c 
ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS

M:	Corentin Chary <corentin.chary@gmail.com>

M:	Luke D. Jones <luke@ljones.dev>

M:	Denis Benato <benato.denis96@gmail.com>

L:	platform-driver-x86@vger.kernel.org

S:	Maintained

W:	https://asus-linux.org/
@@ -12862,7 +12863,8 @@ F: tools/testing/selftests/sgx/* 
K:	\bSGX_









INTEL SKYLAKE INT3472 ACPI DEVICE DRIVER









M:	Daniel Scally <djrscally@gmail.com>









M:	Daniel Scally <dan.scally@ideasonboard.com>









M:	Sakari Ailus <sakari.ailus@linux.intel.com>









S:	Maintained









F:	drivers/platform/x86/intel/int3472/









F:	include/linux/platform_data/x86/int3472.h
































drivers/platform/arm64/lenovo-thinkpad-t14s.c



+10
−6






























Original line number
Diff line number
Diff line







@@ -124,6 +124,7 @@ static int t14s_ec_write(void *context, unsigned int reg,







	if (ret < 0)









		return ret;



















	fsleep(10000);









	return 0;









}


















@@ -161,6 +162,7 @@ static int t14s_ec_read(void *context, unsigned int reg,

















out:









	i2c_unlock_bus(client->adapter, I2C_LOCK_SEGMENT);









	fsleep(10000);









	return ret;









}


















@@ -195,6 +197,8 @@ static int t14s_ec_read_evt(struct t14s_ec *ec, u8 *val)







	if (ret < 0)









		goto out;



















	fsleep(10000);



















	ret = 0;



















out:








@@ -570,12 +574,6 @@ static int t14s_ec_probe(struct i2c_client *client)







		return dev_err_probe(dev, PTR_ERR(ec->regmap),









				     "Failed to init regmap\n");



















	ret = devm_request_threaded_irq(dev, client->irq, NULL,









					t14s_ec_irq_handler,









					IRQF_ONESHOT, dev_name(dev), ec);









	if (ret < 0)









		return dev_err_probe(dev, ret, "Failed to get IRQ\n");



















	ret = t14s_leds_probe(ec);









	if (ret < 0)









		return ret;








@@ -592,6 +590,12 @@ static int t14s_ec_probe(struct i2c_client *client)







	if (ret < 0)









		return ret;



















	ret = devm_request_threaded_irq(dev, client->irq, NULL,









					t14s_ec_irq_handler,









					IRQF_ONESHOT, dev_name(dev), ec);









	if (ret < 0)









		return dev_err_probe(dev, ret, "Failed to get IRQ\n");



















	/*









	 * Disable wakeup support by default, because the driver currently does









	 * not support masking any events and the laptop should not wake up when
































drivers/platform/mellanox/mlxbf-pmc.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -2015,6 +2015,7 @@ static int mlxbf_pmc_init_perftype_counter(struct device *dev, unsigned int blk_







	if (pmc->block[blk_num].type == MLXBF_PMC_TYPE_CRSPACE) {









		/* Program crspace counters to count clock cycles using "count_clock" sysfs */









		attr = &pmc->block[blk_num].attr_count_clock;









		sysfs_attr_init(&attr->dev_attr.attr);









		attr->dev_attr.attr.mode = 0644;









		attr->dev_attr.show = mlxbf_pmc_count_clock_show;









		attr->dev_attr.store = mlxbf_pmc_count_clock_store;
































drivers/platform/x86/Kconfig



+2
−1






























Original line number
Diff line number
Diff line







@@ -440,7 +440,7 @@ config WIRELESS_HOTKEY







	depends on INPUT









	help









	 This driver provides supports for the wireless buttons found on some AMD,









	 HP, & Xioami laptops.









	 HP, & Xiaomi laptops.









	 On such systems the driver should load automatically (via ACPI alias).



















	 To compile this driver as a module, choose M here: the module will








@@ -553,6 +553,7 @@ config MSI_WMI







config MSI_WMI_PLATFORM









	tristate "MSI WMI Platform features"









	depends on ACPI_WMI









	depends on DMI









	depends on HWMON









	help









	  Say Y here if you want to have support for WMI-based platform features