summaryrefslogtreecommitdiffstats
path: root/drivers/platform/goldfish
diff options
context:
space:
mode:
authorJason Hu <jia-cheng.hu@intel.com>2016-01-06 14:06:55 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-28 23:34:36 -0800
commitd62f324b0ac80c3923ebbf897735c7c24ba887b8 (patch)
tree67b70b8a850aa08fac082f417bfed21dc77b3de8 /drivers/platform/goldfish
parent4f42071c943977e91e7fda8230e4f85bc3ba117a (diff)
downloadlinux-d62f324b0ac80c3923ebbf897735c7c24ba887b8.tar.gz
linux-d62f324b0ac80c3923ebbf897735c7c24ba887b8.tar.bz2
linux-d62f324b0ac80c3923ebbf897735c7c24ba887b8.zip
goldfish: Enable ACPI-based enumeration for android pipe
Add ACPI binding to the android pipe driver Signed-off-by: Jason Hu <jia-cheng.hu@intel.com> Signed-off-by: Jin Qian <jinqian@android.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
-rw-r--r--drivers/platform/goldfish/goldfish_pipe.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index c214434e8811..e3fab9a1d9f7 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -59,6 +59,7 @@
#include <linux/io.h>
#include <linux/goldfish.h>
#include <linux/mm.h>
+#include <linux/acpi.h>
/*
* IMPORTANT: The following constants must match the ones used and defined
@@ -650,6 +651,12 @@ static int goldfish_pipe_remove(struct platform_device *pdev)
return 0;
}
+static const struct acpi_device_id goldfish_pipe_acpi_match[] = {
+ { "GFSH0003", 0 },
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, goldfish_pipe_acpi_match);
+
static const struct of_device_id goldfish_pipe_of_match[] = {
{ .compatible = "google,android-pipe", },
{},
@@ -663,6 +670,7 @@ static struct platform_driver goldfish_pipe = {
.name = "goldfish_pipe",
.owner = THIS_MODULE,
.of_match_table = goldfish_pipe_of_match,
+ .acpi_match_table = ACPI_PTR(goldfish_pipe_acpi_match),
}
};