| Message ID | 20220215152800.21104-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/4] pinctrl: tigerlake: Revert "Add Alder Lake-M ACPI ID" | expand |
On Tue, Feb 15, 2022 at 05:27:57PM +0200, Andy Shevchenko wrote: > 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> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Please mark this for stable too as discussed.
On Tue, Feb 15, 2022 at 06:44:40PM +0200, Mika Westerberg wrote: > On Tue, Feb 15, 2022 at 05:27:57PM +0200, Andy Shevchenko wrote: > > 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> > > Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Thanks! I have sent a PR to the Linus W. with this one patch. > Please mark this for stable too as discussed.
diff --git a/drivers/pinctrl/intel/pinctrl-tigerlake.c b/drivers/pinctrl/intel/pinctrl-tigerlake.c index 0bcd19597e4a..3ddaeffc0415 100644 --- a/drivers/pinctrl/intel/pinctrl-tigerlake.c +++ b/drivers/pinctrl/intel/pinctrl-tigerlake.c @@ -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);
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> --- drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 - 1 file changed, 1 deletion(-)