aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorJason Hu <jia-cheng.hu@intel.com>2016-02-26 15:06:47 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-03-02 12:39:00 -0500
commit0581ce09fd2c976125a20791268d7206db156d2f (patch)
tree8ca5048312380909404917d33deaaa79545af7aa /drivers/input/keyboard
parent8c5dc5a1ada2b79259e55a4bd150135d23529c6a (diff)
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/keyboard')
-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 b11d218604a7..f6e643b589b6 100644
--- a/drivers/input/keyboard/goldfish_events.c
+++ b/drivers/input/keyboard/goldfish_events.c
@@ -22,6 +22,7 @@
22#include <linux/slab.h> 22#include <linux/slab.h>
23#include <linux/irq.h> 23#include <linux/irq.h>
24#include <linux/io.h> 24#include <linux/io.h>
25#include <linux/acpi.h>
25 26
26enum { 27enum {
27 REG_READ = 0x00, 28 REG_READ = 0x00,
@@ -184,11 +185,20 @@ static const struct of_device_id goldfish_events_of_match[] = {
184}; 185};
185MODULE_DEVICE_TABLE(of, goldfish_events_of_match); 186MODULE_DEVICE_TABLE(of, goldfish_events_of_match);
186 187
188#ifdef CONFIG_ACPI
189static const struct acpi_device_id goldfish_events_acpi_match[] = {
190 { "GFSH0002", 0 },
191 { },
192};
193MODULE_DEVICE_TABLE(acpi, goldfish_events_acpi_match);
194#endif
195
187static struct platform_driver events_driver = { 196static struct platform_driver events_driver = {
188 .probe = events_probe, 197 .probe = events_probe,
189 .driver = { 198 .driver = {
190 .name = "goldfish_events", 199 .name = "goldfish_events",
191 .of_match_table = goldfish_events_of_match, 200 .of_match_table = goldfish_events_of_match,
201 .acpi_match_table = ACPI_PTR(goldfish_events_acpi_match),
192 }, 202 },
193}; 203};
194 204