aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaresh Bhat <naresh.bhat@linaro.org>2013-10-23 16:53:31 +0530
committerGraeme Gregory <graeme.gregory@linaro.org>2014-06-03 09:24:35 +0100
commit47fc59a29884a5a5b8c7a2477452c048b171f5b5 (patch)
tree94e2241f74e37dc2201056e2e41b5fc916b132ab
parente199f9a49c8ae6bff2a2f1add5554d90fe328011 (diff)
downloadleg-kernel-47fc59a29884a5a5b8c7a2477452c048b171f5b5.tar.gz
v2m_sysreg: Add ACPI probing for SYSREG
Add match table and pointers for ACPI probing into vexpress-sysreg driver. Signed-off-by: Naresh Bhat <naresh.bhat@linaro.org>
-rw-r--r--drivers/mfd/vexpress-sysreg.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c
index 35281e804e7e..b9c0e2b9064f 100644
--- a/drivers/mfd/vexpress-sysreg.c
+++ b/drivers/mfd/vexpress-sysreg.c
@@ -22,6 +22,7 @@
#include <linux/stat.h>
#include <linux/timer.h>
#include <linux/vexpress.h>
+#include <linux/acpi.h>
#define SYS_ID 0x000
#define SYS_SW 0x004
@@ -512,10 +513,18 @@ static const struct of_device_id vexpress_sysreg_match[] = {
{},
};
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id vexpress_sysreg_acpi_match[] = {
+ { "LNRO0009", },
+ { }
+};
+#endif
+
static struct platform_driver vexpress_sysreg_driver = {
.driver = {
.name = "vexpress-sysreg",
.of_match_table = vexpress_sysreg_match,
+ .acpi_match_table = ACPI_PTR(vexpress_sysreg_acpi_match),
},
.probe = vexpress_sysreg_probe,
};