summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJason Hu <jia-cheng.hu@intel.com>2016-02-26 20:06:47 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-03-02 17:39:00 (GMT)
commit0581ce09fd2c976125a20791268d7206db156d2f (patch)
tree8ca5048312380909404917d33deaaa79545af7aa /drivers/input
parent8c5dc5a1ada2b79259e55a4bd150135d23529c6a (diff)
downloadlinux-0581ce09fd2c976125a20791268d7206db156d2f.tar.xz
Input: goldfish_events - enable ACPI-based enumeration for goldfish events
Add ACPI binding to the goldfish events driver. Signed-off-by: Jason Hu <jia-cheng.hu@intel.com> Signed-off-by: Jin Qian <jinqian@android.com> Signed-off-by: Alan <alan@linux.intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/goldfish_events.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/input/keyboard/goldfish_events.c b/drivers/input/keyboard/goldfish_events.c
index b11d218..f6e643b 100644
--- a/drivers/input/keyboard/goldfish_events.c
+++ b/drivers/input/keyboard/goldfish_events.c
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <linux/io.h>
+#include <linux/acpi.h>
enum {
REG_READ = 0x00,
@@ -184,11 +185,20 @@ static const struct of_device_id goldfish_events_of_match[] = {
};
MODULE_DEVICE_TABLE(of, goldfish_events_of_match);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id goldfish_events_acpi_match[] = {
+ { "GFSH0002", 0 },
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, goldfish_events_acpi_match);
+#endif
+
static struct platform_driver events_driver = {
.probe = events_probe,
.driver = {
.name = "goldfish_events",
.of_match_table = goldfish_events_of_match,
+ .acpi_match_table = ACPI_PTR(goldfish_events_acpi_match),
},
};