summaryrefslogtreecommitdiff
path: root/drivers/staging/goldfish
diff options
context:
space:
mode:
authorYu Ning <yu.ning@intel.com>2018-06-04 14:08:21 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-06-17 09:05:14 +0200
commit06e526f49b7a8280c62710265b699254a7cf3344 (patch)
treee18a2bce5e33acdb6d6b2f81f71c1f1eaa7f2264 /drivers/staging/goldfish
parenta75647d1e72f0af686b19940b864f35b9be631d6 (diff)
staging: goldfish: Enable ACPI-based enumeration for goldfish audio
Add an ACPI id to make goldfish audio to support ACPI enumeration. Signed-off-by: Yu Ning <yu.ning@intel.com> Signed-off-by: Roman Kiryanov <rkir@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/goldfish')
-rw-r--r--drivers/staging/goldfish/goldfish_audio.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c
index 3a4715cd362b..14e962ddfc3d 100644
--- a/drivers/staging/goldfish/goldfish_audio.c
+++ b/drivers/staging/goldfish/goldfish_audio.c
@@ -28,6 +28,7 @@
#include <linux/uaccess.h>
#include <linux/slab.h>
#include <linux/goldfish.h>
+#include <linux/acpi.h>
MODULE_AUTHOR("Google, Inc.");
MODULE_DESCRIPTION("Android QEMU Audio Driver");
@@ -365,12 +366,21 @@ static const struct of_device_id goldfish_audio_of_match[] = {
};
MODULE_DEVICE_TABLE(of, goldfish_audio_of_match);
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id goldfish_audio_acpi_match[] = {
+ { "GFSH0005", 0 },
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, goldfish_audio_acpi_match);
+#endif
+
static struct platform_driver goldfish_audio_driver = {
.probe = goldfish_audio_probe,
.remove = goldfish_audio_remove,
.driver = {
.name = "goldfish_audio",
.of_match_table = goldfish_audio_of_match,
+ .acpi_match_table = ACPI_PTR(goldfish_audio_acpi_match),
}
};