summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/intel
diff options
context:
space:
mode:
authorAndy Shevchenko2017-11-10 20:39:28 +0100
committerLinus Walleij2017-11-29 10:29:45 +0100
commitdabd4bc6de2bd33f705e840f4aba6c836df9af21 (patch)
treef5e2b22e6fbda3c914977a4041fe0b3b8eaebaa2 /drivers/pinctrl/intel
parentLinux 4.15-rc1 (diff)
downloadkernel-qcow2-linux-dabd4bc6de2bd33f705e840f4aba6c836df9af21.tar.gz
kernel-qcow2-linux-dabd4bc6de2bd33f705e840f4aba6c836df9af21.tar.xz
kernel-qcow2-linux-dabd4bc6de2bd33f705e840f4aba6c836df9af21.zip
pinctrl: intel: merrifield: Introduce ACPI device table
On Intel Merrifield the pin control device is a separate IP block without any PCI ID assigned. Though, recently we got an allocated ACPI ID for it, so, let's use fresh ID. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/intel')
-rw-r--r--drivers/pinctrl/intel/pinctrl-merrifield.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index 86c4b3fab7b0..d9357054d41d 100644
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -931,10 +931,17 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
return 0;
}
+static const struct acpi_device_id mrfld_acpi_table[] = {
+ { "INTC1002" },
+ { }
+};
+MODULE_DEVICE_TABLE(acpi, mrfld_acpi_table);
+
static struct platform_driver mrfld_pinctrl_driver = {
.probe = mrfld_pinctrl_probe,
.driver = {
.name = "pinctrl-merrifield",
+ .acpi_match_table = mrfld_acpi_table,
},
};