Merge branches 'acpi-resource', 'acpi-numa', 'acpi-soc' and 'acpi-misc'

Merge ACPI resources management quirks, ACPI NUMA updates, an ACPI LPSS
(Intel SoC) driver update and an ACPI watchdog driver fixup for 6.8-rc1:

 - Add IRQ override quirks for some Infinity laptops and for TongFang
   GMxXGxx (David McFarland, Hans de Goede).

 - Clean up the ACPI NUMA code and fix it to ensure that fake_pxm is not
   the same as one of the real pxm values (Yuntao Wang).

 - Fix the fractional clock divider flags in the ACPI LPSS (Intel SoC)
   driver so as to prevent miscalculation of the values in the clock
   divider (Andy Shevchenko).

 - Adjust comments in the ACPI watchdog driver to prevent kernel-doc
   from complaining during documentation builds (Randy Dunlap).

* acpi-resource:
  ACPI: resource: Add Infinity laptops to irq1_edge_low_force_override
  ACPI: resource: Add another DMI match for the TongFang GMxXGxx

* acpi-numa:
  ACPI: NUMA: Fix the logic of getting the fake_pxm value
  ACPI: NUMA: Optimize the check for the availability of node values
  ACPI: NUMA: Remove unnecessary check in acpi_parse_gi_affinity()

* acpi-soc:
  ACPI: LPSS: Fix the fractional clock divider flags

* acpi-misc:
  ACPI: watchdog: fix kernel-doc warnings

diff --combined drivers/acpi/acpi_lpss.c
index 920402dfe1add1f1f0276fd58f79bad575abdb53,875de44961bf4b47f0d37a43632b3fa1c2500405,875de44961bf4b47f0d37a43632b3fa1c2500405,d48407472dfb93fbe629948adc2b99a9d84e6402,875de44961bf4b47f0d37a43632b3fa1c2500405..04e273167e92a66b3ce50d83fc084c41f77c12a8
--- 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
@@@@@@ -167,9 -167,13 -167,13 -167,13 -167,13 +167,9 @@@@@@ static struct pwm_lookup byt_pwm_lookup
     
     static void byt_pwm_setup(struct lpss_private_data *pdata)
     {
 ----   u64 uid;
 ----
        /* Only call pwm_add_table for the first PWM controller */
 ----   if (acpi_dev_uid_to_integer(pdata->adev, &uid) || uid != 1)
 ----           return;
 ----
 ----   pwm_add_table(byt_pwm_lookup, ARRAY_SIZE(byt_pwm_lookup));
 ++++   if (acpi_dev_uid_match(pdata->adev, 1))
 ++++           pwm_add_table(byt_pwm_lookup, ARRAY_SIZE(byt_pwm_lookup));
     }
     
     #define LPSS_I2C_ENABLE                    0x6c
@@@@@@ -214,9 -218,13 -218,13 -218,13 -218,13 +214,9 @@@@@@ static struct pwm_lookup bsw_pwm_lookup
     
     static void bsw_pwm_setup(struct lpss_private_data *pdata)
     {
 ----   u64 uid;
 ----
        /* Only call pwm_add_table for the first PWM controller */
 ----   if (acpi_dev_uid_to_integer(pdata->adev, &uid) || uid != 1)
 ----           return;
 ----
 ----   pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup));
 ++++   if (acpi_dev_uid_match(pdata->adev, 1))
 ++++           pwm_add_table(bsw_pwm_lookup, ARRAY_SIZE(bsw_pwm_lookup));
     }
     
     static const struct property_entry lpt_spi_properties[] = {
@@@@@@ -453,8 -461,8 -461,8 -461,9 -461,8 +453,9 @@@@@@ static int register_device_clock(struc
                if (!clk_name)
                        return -ENOMEM;
                clk = clk_register_fractional_divider(NULL, clk_name, parent,
+++ +                                                 0, prv_base, 1, 15, 16, 15,
                                                      CLK_FRAC_DIVIDER_POWER_OF_TWO_PS,
--- -                                                 prv_base, 1, 15, 16, 15, 0, NULL);
+++ +                                                 NULL);
                parent = clk_name;
     
                clk_name = kasprintf(GFP_KERNEL, "%s-update", devname);
@@@@@@ -562,6 -570,34 -570,34 -571,34 -570,34 +563,6 @@@@@@ static struct device *acpi_lpss_find_de
        return bus_find_device(&pci_bus_type, NULL, &data, match_hid_uid);
     }
     
 ----static bool acpi_lpss_dep(struct acpi_device *adev, acpi_handle handle)
 ----{
 ----   struct acpi_handle_list dep_devices;
 ----   acpi_status status;
 ----   bool ret = false;
 ----   int i;
 ----
 ----   if (!acpi_has_method(adev->handle, "_DEP"))
 ----           return false;
 ----
 ----   status = acpi_evaluate_reference(adev->handle, "_DEP", NULL,
 ----                                    &dep_devices);
 ----   if (ACPI_FAILURE(status)) {
 ----           dev_dbg(&adev->dev, "Failed to evaluate _DEP.\n");
 ----           return false;
 ----   }
 ----
 ----   for (i = 0; i < dep_devices.count; i++) {
 ----           if (dep_devices.handles[i] == handle) {
 ----                   ret = true;
 ----                   break;
 ----           }
 ----   }
 ----
 ----   acpi_handle_list_free(&dep_devices);
 ----   return ret;
 ----}
 ----
     static void acpi_lpss_link_consumer(struct device *dev1,
                                    const struct lpss_device_links *link)
     {
@@@@@@ -572,7 -608,7 -608,7 -609,7 -608,7 +573,7 @@@@@@
                return;
     
        if ((link->dep_missing_ids && dmi_check_system(link->dep_missing_ids))
 ----       || acpi_lpss_dep(ACPI_COMPANION(dev2), ACPI_HANDLE(dev1)))
 ++++       || acpi_device_dep(ACPI_HANDLE(dev2), ACPI_HANDLE(dev1)))
                device_link_add(dev2, dev1, link->flags);
     
        put_device(dev2);
@@@@@@ -588,7 -624,7 -624,7 -625,7 -624,7 +589,7 @@@@@@ static void acpi_lpss_link_supplier(str
                return;
     
        if ((link->dep_missing_ids && dmi_check_system(link->dep_missing_ids))
 ----       || acpi_lpss_dep(ACPI_COMPANION(dev1), ACPI_HANDLE(dev2)))
 ++++       || acpi_device_dep(ACPI_HANDLE(dev1), ACPI_HANDLE(dev2)))
                device_link_add(dev1, dev2, link->flags);
     
        put_device(dev2);