Commit d1c2b55d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull x86 platform driver fixes from Hans de Goede:
 "Various build- and bug-fixes as well as one hardware-id addition"

* tag 'platform-drivers-x86-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: thinkpad_acpi: fix documentation for adaptive keyboard
  platform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep
  platform/x86: thinkpad_acpi: Add support for dual fan control
  platform/x86: think-lmi: Abort probe on analyze failure
  platform/x86: dell-wmi-descriptor: disable by default
  platform/x86: samsung-laptop: Fix typo in a comment
  platform/x86: hp_accel: Fix an error handling path in 'lis3lv02d_probe()'
  platform/x86: amd-pmc: Make CONFIG_AMD_PMC depend on RTC_CLASS
  platform/mellanox: mlxreg-lc: fix error code in mlxreg_lc_create_static_devices()
parents ea229296 d477a907

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

+6 −6
Original line number Diff line number Diff line
@@ -1520,15 +1520,15 @@ This sysfs attribute controls the keyboard "face" that will be shown on the 
Lenovo X1 Carbon 2nd gen (2014)'s adaptive keyboard. The value can be read

and set.



- 1 = Home mode

- 2 = Web-browser mode

- 3 = Web-conference mode

- 4 = Function mode

- 5 = Layflat mode

- 0 = Home mode

- 1 = Web-browser mode

- 2 = Web-conference mode

- 3 = Function mode

- 4 = Layflat mode



For more details about which buttons will appear depending on the mode, please

review the laptop's user guide:

http://www.lenovo.com/shop/americas/content/user_guides/x1carbon_2_ug_en.pdf

https://download.lenovo.com/ibmdl/pub/pc/pccbbs/mobiles_pdf/x1carbon_2_ug_en.pdf



Battery charge control

----------------------

drivers/platform/mellanox/mlxreg-lc.c

+3 −2
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl 
				int size)

{

	struct mlxreg_hotplug_device *dev = devs;

	int i;

	int i, ret;



	/* Create static I2C device feeding by auxiliary or main power. */

	for (i = 0; i < size; i++, dev++) {
@@ -423,6 +423,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl 
				dev->brdinfo->type, dev->nr, dev->brdinfo->addr);



			dev->adapter = NULL;

			ret = PTR_ERR(dev->client);

			goto fail_create_static_devices;

		}

	}
@@ -435,7 +436,7 @@ mlxreg_lc_create_static_devices(struct mlxreg_lc *mlxreg_lc, struct mlxreg_hotpl 
		i2c_unregister_device(dev->client);

		dev->client = NULL;

	}

	return IS_ERR(dev->client);

	return ret;

}



static void

drivers/platform/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ config ACER_WMI 


config AMD_PMC

	tristate "AMD SoC PMC driver"

	depends on ACPI && PCI

	depends on ACPI && PCI && RTC_CLASS

	help

	  The driver provides support for AMD Power Management Controller

	  primarily responsible for S2Idle transactions that are driven from

drivers/platform/x86/dell/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ config DELL_WMI_AIO 


config DELL_WMI_DESCRIPTOR

	tristate

	default m

	default n

	depends on ACPI_WMI



config DELL_WMI_LED

drivers/platform/x86/hp_accel.c

+2 −0
Original line number Diff line number Diff line
@@ -331,9 +331,11 @@ static int lis3lv02d_probe(struct platform_device *device) 
	INIT_WORK(&hpled_led.work, delayed_set_status_worker);

	ret = led_classdev_register(NULL, &hpled_led.led_classdev);

	if (ret) {

		i8042_remove_filter(hp_accel_i8042_filter);

		lis3lv02d_joystick_disable(&lis3_dev);

		lis3lv02d_poweroff(&lis3_dev);

		flush_work(&hpled_led.work);

		lis3lv02d_remove_fs(&lis3_dev);

		return ret;

	}