diff options
| author | Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2017-03-09 18:18:58 -0600 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-13 16:18:08 +0000 |
| commit | 8f42c23a9861df7796e019d32fd5c4dea01c8e51 (patch) | |
| tree | 9f7db60e746b705b38fdab26be5b1cf9f5236e2b /sound/soc/codecs/da7213.c | |
| parent | a5de5b74a50113564a1e0850e2da96c37c35e55d (diff) | |
| download | linux-8f42c23a9861df7796e019d32fd5c4dea01c8e51.tar.bz2 | |
ASoC: da7213: add ACPI support
Add DLGS7212 and DLGS7213 HID
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/da7213.c')
| -rw-r--r-- | sound/soc/codecs/da7213.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/codecs/da7213.c b/sound/soc/codecs/da7213.c index 12da55882c06..6dd7578f0bb8 100644 --- a/sound/soc/codecs/da7213.c +++ b/sound/soc/codecs/da7213.c @@ -12,6 +12,7 @@ * option) any later version. */ +#include <linux/acpi.h> #include <linux/clk.h> #include <linux/delay.h> #include <linux/i2c.h> @@ -1528,12 +1529,23 @@ static int da7213_set_bias_level(struct snd_soc_codec *codec, return 0; } +#if defined(CONFIG_OF) /* DT */ static const struct of_device_id da7213_of_match[] = { { .compatible = "dlg,da7213", }, { } }; MODULE_DEVICE_TABLE(of, da7213_of_match); +#endif + +#ifdef CONFIG_ACPI +static const struct acpi_device_id da7213_acpi_match[] = { + { "DLGS7212", 0}, + { "DLGS7213", 0}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, da7213_acpi_match); +#endif static enum da7213_micbias_voltage da7213_of_micbias_lvl(struct snd_soc_codec *codec, u32 val) @@ -1844,6 +1856,7 @@ static struct i2c_driver da7213_i2c_driver = { .driver = { .name = "da7213", .of_match_table = of_match_ptr(da7213_of_match), + .acpi_match_table = ACPI_PTR(da7213_acpi_match), }, .probe = da7213_i2c_probe, .remove = da7213_remove, |