From: Yu Ning <yu.ning@xxxxxxxxx> Add an ACPI id to make goldfish audio to support ACPI enumeration. Signed-off-by: Yu Ning <yu.ning@xxxxxxxxx> Signed-off-by: Roman Kiryanov <rkir@xxxxxxxxxx> --- Changes in v2: - Fixed the commit message. - Added #ifdef CONFIG_ACPI/#endif as suggested in ACPI based device enumeration/Platform bus support. drivers/staging/goldfish/goldfish_audio.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c index 2bec3205326e..878fd4120642 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"); @@ -368,12 +369,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), } }; -- 2.17.1.1185.g55be947832-goog _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel