summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2024-08-07 20:56:33 +0300
committerLinus Walleij <linus.walleij@linaro.org>2024-08-07 20:56:33 +0300
commitcd7d3f4f9756df0b14e5c91d6ba072372033ba18 (patch)
tree355e50020966046c73944ba13504232bbbf5361b /drivers
parent0274d8098291d87f61f1f8e5b22214abb5324669 (diff)
parenta366e46da10d7bfa1a52c3bd31f342a3d0e8e7fe (diff)
downloadlinux-cd7d3f4f9756df0b14e5c91d6ba072372033ba18.tar.xz
Merge tag 'intel-pinctrl-v6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel into devel
intel-pinctrl for v6.11-1 This includes a new ACPI ID that is added to the Intel Meteor Lake driver to support recent Intel Arrow Lake hardware. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/intel/pinctrl-meteorlake.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-meteorlake.c b/drivers/pinctrl/intel/pinctrl-meteorlake.c
index cc44890c6699..885fa3b0d6d9 100644
--- a/drivers/pinctrl/intel/pinctrl-meteorlake.c
+++ b/drivers/pinctrl/intel/pinctrl-meteorlake.c
@@ -584,6 +584,7 @@ static const struct intel_pinctrl_soc_data mtls_soc_data = {
};
static const struct acpi_device_id mtl_pinctrl_acpi_match[] = {
+ { "INTC105E", (kernel_ulong_t)&mtlp_soc_data },
{ "INTC1083", (kernel_ulong_t)&mtlp_soc_data },
{ "INTC1082", (kernel_ulong_t)&mtls_soc_data },
{ }