Commit 06e526f4 authored by Yu Ning's avatar Yu Ning Committed by Greg Kroah-Hartman

staging: goldfish: Enable ACPI-based enumeration for goldfish audio

Add an ACPI id to make goldfish audio to support ACPI enumeration.
Signed-off-by: default avatarYu Ning <yu.ning@intel.com>
Signed-off-by: default avatarRoman Kiryanov <rkir@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a75647d1
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/goldfish.h> #include <linux/goldfish.h>
#include <linux/acpi.h>
MODULE_AUTHOR("Google, Inc."); MODULE_AUTHOR("Google, Inc.");
MODULE_DESCRIPTION("Android QEMU Audio Driver"); MODULE_DESCRIPTION("Android QEMU Audio Driver");
...@@ -365,12 +366,21 @@ static const struct of_device_id goldfish_audio_of_match[] = { ...@@ -365,12 +366,21 @@ static const struct of_device_id goldfish_audio_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, 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 = { static struct platform_driver goldfish_audio_driver = {
.probe = goldfish_audio_probe, .probe = goldfish_audio_probe,
.remove = goldfish_audio_remove, .remove = goldfish_audio_remove,
.driver = { .driver = {
.name = "goldfish_audio", .name = "goldfish_audio",
.of_match_table = goldfish_audio_of_match, .of_match_table = goldfish_audio_of_match,
.acpi_match_table = ACPI_PTR(goldfish_audio_acpi_match),
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment