From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 26 Nov 2019 09:30:49 +0000 (+0100)
Subject: Merge branches 'acpi-utils', 'acpi-platform', 'acpi-video' and 'acpi-doc'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=995e2ef08280dab8de6c517acd836613678fe2a3;p=linux.git

Merge branches 'acpi-utils', 'acpi-platform', 'acpi-video' and 'acpi-doc'

* acpi-utils:
  iommu/amd: Switch to use acpi_dev_hid_uid_match()
  mmc: sdhci-acpi: Switch to use acpi_dev_hid_uid_match()
  ACPI / LPSS: Switch to use acpi_dev_hid_uid_match()
  ACPI / utils: Introduce acpi_dev_hid_uid_match() helper
  ACPI / utils: Move acpi_dev_get_first_match_dev() under CONFIG_ACPI
  ACPI / utils: Describe function parameters in kernel-doc

* acpi-platform:
  ACPI: platform: Unregister stale platform devices
  ACPI: Always build evged in

* acpi-video:
  ACPI: video: update doc for acpi_video_bus_DOS()

* acpi-doc:
  ACPI: Documentation: Minor spelling fix in namespace.rst
---

995e2ef08280dab8de6c517acd836613678fe2a3
diff --cc drivers/acpi/acpi_lpss.c
index 751ed38f2a10e,1e520ea160423,60bbc5090abec,60bbc5090abec,60bbc5090abec..70f740b096847
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@@@@@ -486,34 -473,11 -473,26 -473,26 -473,26 +486,19 @@@@@@ static const struct dmi_system_id i2c1_
      * the supplier is not enumerated until after the consumer is probed.
      */
     static const struct lpss_device_links lpss_device_links[] = {
 ++++	/* CHT External sdcard slot controller depends on PMIC I2C ctrl */
     	{"808622C1", "7", "80860F14", "3", DL_FLAG_PM_RUNTIME},
 ++++	/* CHT iGPU depends on PMIC I2C controller */
     	{"808622C1", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
 ++++	/* BYT iGPU depends on the Embedded Controller I2C controller (UID 1) */
 ++++	{"80860F41", "1", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME,
 ++++	 i2c1_dep_missing_dmi_ids},
 ++++	/* BYT CR iGPU depends on PMIC I2C controller (UID 5 on CR) */
     	{"80860F41", "5", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
 ++++	/* BYT iGPU depends on PMIC I2C controller (UID 7 on non CR) */
 ++++	{"80860F41", "7", "LNXVIDEO", NULL, DL_FLAG_PM_RUNTIME},
     };
     
- ---static bool hid_uid_match(struct acpi_device *adev,
- ---			  const char *hid2, const char *uid2)
- ---{
- ---	const char *hid1 = acpi_device_hid(adev);
- ---	const char *uid1 = acpi_device_uid(adev);
- ---
- ---	if (strcmp(hid1, hid2))
- ---		return false;
- ---
- ---	if (!uid2)
- ---		return true;
- ---
- ---	return uid1 && !strcmp(uid1, uid2);
- ---}
- ---
     static bool acpi_lpss_is_supplier(struct acpi_device *adev,
     				  const struct lpss_device_links *link)
     {