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

diff --cc drivers/acpi/Makefile
Simple merge

diff --cc drivers/acpi/acpi_lpss.c
index 751ed38f2a10e7759a1a00adb2204494a69d9dac,1e520ea1604232f6c96ffdc0cdf5334d7cd4890d,60bbc5090abec0a626d88dda38c3729b41cc2446,60bbc5090abec0a626d88dda38c3729b41cc2446,60bbc5090abec0a626d88dda38c3729b41cc2446..70f740b096847b6d0add9fca42b17ae6e6ba7133
--- 1/drivers/acpi/acpi_lpss.c
--- 2/drivers/acpi/acpi_lpss.c
--- 3/drivers/acpi/acpi_lpss.c
--- 4/drivers/acpi/acpi_lpss.c
--- 5/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)
     {

diff --cc drivers/iommu/amd_iommu.c
Simple merge