leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Yu Ning 2018-06-04 14:08:21 -07:00 committed by Greg Kroah-Hartman
parent a75647d1e7
commit 06e526f49b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/goldfish/goldfish_audio.c
View File

@ -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[] = {
}; };
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),
} }
}; };