On Fri, Mar 27, 2020 at 10:34 PM Gayatri Kammela
<gayatri.kammela@xxxxxxxxx> wrote:
>
> 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")
> Cc: 5.6+ <stable@xxxxxxxxxxxxxxx> # 5.6+
> Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Cc: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxx>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> Suggested-by: Srinivas Pandruvada <srinivas.pandruvada@xxxxxxxxx>
> Signed-off-by: Gayatri Kammela <gayatri.kammela@xxxxxxxxx>
> ---
> drivers/acpi/device_pm.c | 2 +-
> drivers/acpi/dptf/dptf_power.c | 2 +-
> drivers/acpi/dptf/int340x_thermal.c | 8 ++++----
> 3 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
> index b64c62bfcea5..80dae3b3c36a 100644
> --- a/drivers/acpi/device_pm.c
> +++ b/drivers/acpi/device_pm.c
> @@ -1321,7 +1321,7 @@ 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 */
> + {"INTC1044", }, /* Fan for Tiger Lake generation */
> {"INT3404", }, /* Fan */
> {}
> };
> diff --git a/drivers/acpi/dptf/dptf_power.c b/drivers/acpi/dptf/dptf_power.c
> index 387f27ef3368..e5fb34bfa52c 100644
> --- a/drivers/acpi/dptf/dptf_power.c
> +++ b/drivers/acpi/dptf/dptf_power.c
> @@ -97,7 +97,7 @@ static int dptf_power_remove(struct platform_device *pdev)
> }
>
> static const struct acpi_device_id int3407_device_ids[] = {
> - {"INT1047", 0},
> + {"INTC1047", 0},
> {"INT3407", 0},
> {"", 0},
> };
> diff --git a/drivers/acpi/dptf/int340x_thermal.c b/drivers/acpi/dptf/int340x_thermal.c
> index 1ec7b6900662..29b5c77256dd 100644
> --- a/drivers/acpi/dptf/int340x_thermal.c
> +++ b/drivers/acpi/dptf/int340x_thermal.c
> @@ -13,10 +13,10 @@
>
> #define INT3401_DEVICE 0X01
> static const struct acpi_device_id int340x_thermal_device_ids[] = {
> - {"INT1040"},
> - {"INT1043"},
> - {"INT1044"},
> - {"INT1047"},
> + {"INTC1040"},
> + {"INTC1043"},
> + {"INTC1044"},
> + {"INTC1047"},
> {"INT3400"},
> {"INT3401", INT3401_DEVICE},
> {"INT3402"},
> --
I can take this along with the other two patches in the series if that
is fine by Andy and Rui.
Thanks!
