Commit 59825bc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v7.1-4' of... 

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

Pull x86 platform driver fixes from

 - Add ACPI_HANDLE()/ACPI_COMPANION() NULL checks (many drivers) to
   handle match overrides gracefully

 - asus-armoury:
    - Fix mini-LED mode get/set
    - Add support for FA401EA, FX607VU, G614FR, and GU605CP

 - bitland-mifs-wmi:
    - Add CONFIG_LEDS_CLASS dependency

 - hp-wmi:
    - Add thermal support for Omen 16-c0xxx (board 8902)

 - intel/vsec:
    - Fix enable_cnt imbalance due to PCIe error recovery

 - surface/aggregator_registry:
    - Remove battery & AC nodes on Surface Laptop 7 to avoid duplicated
      devices

 - uniwill-laptop:
    - Handle uninitialized and invalid charging threshold values
    - Accept charging threshold of 0 through power supply sysfs ABI and
      clamp it to 1
    - Make 'force' parameter to work also when device descriptor is
      found
    - Do not enable charging limit despite the 'force' parameter to
      avoid permanent damage to battery

* tag 'platform-drivers-x86-v7.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (35 commits)
  platform/x86: bitland-mifs-wmi: add CONFIG_LEDS_CLASS dependency
  platform/x86: wireless-hotkey: Check ACPI_COMPANION() against NULL
  platform/x86: toshiba_haps: Check ACPI_COMPANION() against NULL
  platform/x86: toshiba_bluetooth: Check ACPI_COMPANION() against NULL
  platform/x86: toshiba_acpi: Check ACPI_COMPANION() against NULL
  platform/x86: system76: Check ACPI_COMPANION() against NULL
  platform/x86: sony-laptop: Check ACPI_COMPANION() against NULL
  platform/x86: panasonic-laptop: Check ACPI_COMPANION() against NULL
  platform/x86: lg-laptop: Check ACPI_COMPANION() against NULL
  platform/x86: intel/smartconnect: Check ACPI_HANDLE() against NULL
  platform/x86: intel/rst: Check ACPI_COMPANION() against NULL
  platform/x86: fujitsu-tablet: Check ACPI_COMPANION() against NULL
  platform/x86: fujitsu: Check ACPI_COMPANION() against NULL
  platform/x86: eeepc-laptop: Check ACPI_COMPANION() against NULL
  platform/x86: dell/dell-rbtn: Check ACPI_COMPANION() against NULL
  platform/x86: asus-laptop: Check ACPI_COMPANION() against NULL
  platform/x86: acer-wireless: Check ACPI_COMPANION() against NULL
  platform/x86: asus-armoury: add support for GU605CP
  platform/x86: asus-armoury: add support for FA401EA
  platform/x86: asus-armoury: add support for G614FR
  ...
parents cca95436 654ddf85

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

+10 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ Support for changing the platform performance mode is currently not implemented. 
Battery Charging Control

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



.. warning:: Some devices do not properly implement the charging threshold interface. Forcing

             the driver to enable access to said interface on such devices might damage the

             battery [1]_. Because of this the driver will not enable said feature even when

             using the ``force`` module parameter.



The ``uniwill-laptop`` driver supports controlling the battery charge limit. This happens over

the standard ``charge_control_end_threshold`` power supply sysfs attribute. All values

between 1 and 100 percent are supported.
@@ -70,3 +75,8 @@ The ``uniwill-laptop`` driver allows to set the configurable TGP for devices wit 
allow it.



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



References

==========



.. [1] https://www.reddit.com/r/XMG_gg/comments/ld9yyf/battery_limit_hidden_function_discovered_on/

drivers/platform/surface/surface_aggregator_registry.c

+0 −2
Original line number Diff line number Diff line
@@ -295,8 +295,6 @@ static const struct software_node *ssam_node_group_sl6[] = { 
/* Devices for Surface Laptop 7. */

static const struct software_node *ssam_node_group_sl7[] = {

	&ssam_node_root,

	&ssam_node_bat_ac,

	&ssam_node_bat_main,

	&ssam_node_tmp_perf_profile_with_fan,

	&ssam_node_fan_speed,

	&ssam_node_hid_sam_keyboard,

drivers/platform/surface/surfacepro3_button.c

+7 −3
Original line number Diff line number Diff line
@@ -185,12 +185,15 @@ static bool surface_button_check_MSHW0040(struct device *dev, acpi_handle handle 


static int surface_button_probe(struct platform_device *pdev)

{

	struct acpi_device *device = ACPI_COMPANION(&pdev->dev);

	struct surface_button *button;

	struct acpi_device *device;

	struct input_dev *input;

	const char *hid = acpi_device_hid(device);

	int error;



	device = ACPI_COMPANION(&pdev->dev);

	if (!device)

		return -ENODEV;



	if (strncmp(acpi_device_bid(device), SURFACE_BUTTON_OBJ_NAME,

	    strlen(SURFACE_BUTTON_OBJ_NAME)))

		return -ENODEV;
@@ -210,7 +213,8 @@ static int surface_button_probe(struct platform_device *pdev) 
	}



	strscpy(acpi_device_name(device), SURFACE_BUTTON_DEVICE_NAME);

	snprintf(button->phys, sizeof(button->phys), "%s/buttons", hid);

	snprintf(button->phys, sizeof(button->phys), "%s/buttons",

		 acpi_device_hid(device));



	input->name = acpi_device_name(device);

	input->phys = button->phys;

drivers/platform/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ config BITLAND_MIFS_WMI 
	depends on ACPI_WMI

	depends on HWMON

	depends on INPUT

	depends on LEDS_CLASS

	depends on POWER_SUPPLY

	select ACPI_PLATFORM_PROFILE

	select INPUT_SPARSEKMAP

drivers/platform/x86/acer-wireless.c

+6 −2
Original line number Diff line number Diff line
@@ -37,9 +37,14 @@ static void acer_wireless_notify(acpi_handle handle, u32 event, void *data) 


static int acer_wireless_probe(struct platform_device *pdev)

{

	struct acpi_device *adev;

	struct input_dev *idev;

	int ret;



	adev = ACPI_COMPANION(&pdev->dev);

	if (!adev)

		return -ENODEV;



	idev = devm_input_allocate_device(&pdev->dev);

	if (!idev)

		return -ENOMEM;
@@ -57,8 +62,7 @@ static int acer_wireless_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	return acpi_dev_install_notify_handler(ACPI_COMPANION(&pdev->dev),

					       ACPI_DEVICE_NOTIFY,

	return acpi_dev_install_notify_handler(adev, ACPI_DEVICE_NOTIFY,

					       acer_wireless_notify,

					       &pdev->dev);

}