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

ASoC: pcm512x: Add ACPI support

Browse Source 
HID is assumed to be made of TI PCI ID (0x104C) + part number, so all
four 104C5121, 104C5122, 104C5141 104C5142 are valid.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2018-05-17 17:53:26 -05:00 committed by Mark Brown
parent 3a4f4f2963
commit b84f48d181
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/codecs/pcm512x-i2c.c
View File

@ -17,6 +17,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/acpi.h>
#include "pcm512x.h" #include "pcm512x.h"
@ -52,6 +53,7 @@ static const struct i2c_device_id pcm512x_i2c_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id); MODULE_DEVICE_TABLE(i2c, pcm512x_i2c_id);
#if defined(CONFIG_OF)
static const struct of_device_id pcm512x_of_match[] = { static const struct of_device_id pcm512x_of_match[] = {
{ .compatible = "ti,pcm5121", }, { .compatible = "ti,pcm5121", },
{ .compatible = "ti,pcm5122", }, { .compatible = "ti,pcm5122", },
@ -60,6 +62,18 @@ static const struct of_device_id pcm512x_of_match[] = {
{ } { }
}; };
MODULE_DEVICE_TABLE(of, pcm512x_of_match); MODULE_DEVICE_TABLE(of, pcm512x_of_match);
#endif
#ifdef CONFIG_ACPI
static const struct acpi_device_id pcm512x_acpi_match[] = {
{ "104C5121", 0 },
{ "104C5122", 0 },
{ "104C5141", 0 },
{ "104C5142", 0 },
{ },
};
MODULE_DEVICE_TABLE(acpi, pcm512x_acpi_match);
#endif
static struct i2c_driver pcm512x_i2c_driver = { static struct i2c_driver pcm512x_i2c_driver = {
.probe = pcm512x_i2c_probe, .probe = pcm512x_i2c_probe,
@ -67,7 +81,8 @@ static struct i2c_driver pcm512x_i2c_driver = {
.id_table = pcm512x_i2c_id, .id_table = pcm512x_i2c_id,
.driver = { .driver = {
.name = "pcm512x", .name = "pcm512x",
.of_match_table = pcm512x_of_match, .of_match_table = of_match_ptr(pcm512x_of_match),
.acpi_match_table = ACPI_PTR(pcm512x_acpi_match),
.pm = &pcm512x_pm_ops, .pm = &pcm512x_pm_ops,
}, },
}; };