Merge branches 'acpi-battery', 'acpi-video', 'acpi-fan' and 'acpi-drivers'

* acpi-battery:
  ACPI / battery: Deal better with neither design nor full capacity not being reported
  ACPI / battery: Use design-cap for capacity calculations if full-cap is not available
  ACPI / battery: Deal with design or full capacity being reported as -1

* acpi-video:
  ACPI: video: Do not export a non working backlight interface on MSI MS-7721 boards
  ACPI: video: Use native backlight on Lenovo E41-25/45
  ACPI: video: fix typo in comment

* acpi-fan:
  ACPI: fan: Expose fan performance state information

* acpi-drivers:
  thermal: int340x_thermal: Add Tiger Lake ACPI device IDs
  platform/x86: intel-hid: Add Tiger Lake ACPI device ID
  ACPI: fan: Add Tiger Lake ACPI device ID
  ACPI: DPTF: Add Tiger Lake ACPI device IDs

This commit is contained in:

Rafael J. Wysocki

2020-01-27 10:57:09 +01:00

parent ff7a672f83 ff3154d1d8 d21a91629f d19e470b66 9b1b5535df

commit 3dd855147f

12 changed files with 247 additions and 28 deletions

									
										drivers/platform/x86/intel-hid.c
									
		+1
		
												View File
												
				@@ -19,6 +19,7 @@ MODULE_LICENSE("GPL");

				MODULE_AUTHOR("Alex Hung");

				static const struct acpi_device_id intel_hid_ids[] = {

					{"INT1051", 0},

					{"INT33D5", 0},

					{"", 0},

				};