]> git.itanic.dy.fi Git - linux-stable/commitdiff
pinctrl: tigerlake: Revert "Add Alder Lake-M ACPI ID"
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 14 Dec 2021 17:49:13 +0000 (19:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 16 Mar 2022 13:26:46 +0000 (14:26 +0100)
[ Upstream commit 6f66db29e2415cbe8759c48584f9cae19b3c2651 ]

It appears that last minute change moved ACPI ID of Alder Lake-M
to the INTC1055, which is already in the driver.

This ID on the other hand will be used elsewhere.

This reverts commit 258435a1c8187f559549e515d2f77fa0b57bcd27.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pinctrl/intel/pinctrl-tigerlake.c

index 0bcd19597e4adad2f4f439d03aeb37d377e4bfb8..3ddaeffc04150afab70e612e09e44c52368d3717 100644 (file)
@@ -749,7 +749,6 @@ static const struct acpi_device_id tgl_pinctrl_acpi_match[] = {
        { "INT34C5", (kernel_ulong_t)&tgllp_soc_data },
        { "INT34C6", (kernel_ulong_t)&tglh_soc_data },
        { "INTC1055", (kernel_ulong_t)&tgllp_soc_data },
-       { "INTC1057", (kernel_ulong_t)&tgllp_soc_data },
        { }
 };
 MODULE_DEVICE_TABLE(acpi, tgl_pinctrl_acpi_match);