ACPI: Update Tiger Lake ACPI device IDs

Tiger Lake's new unique ACPI device IDs for DPTF and fan drivers are not
valid as the IDs are missing 'C'. Fix the IDs by updating them.

After the update, the new IDs should now look like
INT1047 --> INTC1047
INT1040 --> INTC1040
INT1043 --> INTC1043
INT1044 --> INTC1044

Fixes: 55cfe6a5c582 ("ACPI: DPTF: Add Tiger Lake ACPI device IDs")
Fixes: c248dfe7e0ca ("ACPI: fan: Add Tiger Lake ACPI device ID")
Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
Signed-off-by: Gayatri Kammela <gayatri.kammela@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index b64c62bfcea566be3a8435760d17e0af56632cde..b2263ec67b432e14cca0df18434fed68cab0373e 100644 (file)
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -1321,8 +1321,8 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
         */
        static const struct acpi_device_id special_pm_ids[] = {
                {"PNP0C0B", }, /* Generic ACPI fan */
-               {"INT1044", }, /* Fan for Tiger Lake generation */
                {"INT3404", }, /* Fan */
+               {"INTC1044", }, /* Fan for Tiger Lake generation */
                {}
        };
        struct acpi_device *adev = ACPI_COMPANION(dev);

diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
index 387f27ef3368b1f9e591e0b143331428f36c1241..e4e8b75d39f09240333c78eb0410fd058632ad5b 100644 (file)
--- a/drivers/acpi/dptf/dptf_power.c
+++ b/drivers/acpi/dptf/dptf_power.c
@@ -97,8 +97,8 @@ static int dptf_power_remove(struct platform_device *pdev)
 }
 
 static const struct acpi_device_id int3407_device_ids[] = {
-       {"INT1047", 0},
        {"INT3407", 0},
+       {"INTC1047", 0},
        {"", 0},
 };
 MODULE_DEVICE_TABLE(acpi, int3407_device_ids);

diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
index 1ec7b6900662cadac2bf498b6a9874bd99b92354..bc71a6a603345732bcf400112a2c767b9065ec85 100644 (file)
--- a/drivers/acpi/dptf/int340x_thermal.c
+++ b/drivers/acpi/dptf/int340x_thermal.c
@@ -13,10 +13,6 @@
 
 #define INT3401_DEVICE 0X01
 static const struct acpi_device_id int340x_thermal_device_ids[] = {
-       {"INT1040"},
-       {"INT1043"},
-       {"INT1044"},
-       {"INT1047"},
        {"INT3400"},
        {"INT3401", INT3401_DEVICE},
        {"INT3402"},
@@ -28,6 +24,10 @@ static const struct acpi_device_id int340x_thermal_device_ids[] = {
        {"INT3409"},
        {"INT340A"},
        {"INT340B"},
+       {"INTC1040"},
+       {"INTC1043"},
+       {"INTC1044"},
+       {"INTC1047"},
        {""},
 };