diff options
| author | Mark Brown <broonie@kernel.org> | 2022-05-04 15:30:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-05-04 15:30:32 +0100 |
| commit | c0b38be14f1d843c29edc763d3df3cc741a2bf10 (patch) | |
| tree | 7b4923fbd72134f891faa6866246e16b8a4b30dc /sound/soc/codecs/wm8960.c | |
| parent | 55d2a66cfec6a4196243940f754f5b34dd2106bf (diff) | |
| parent | a962890a5a3cce903ff7c7a19fadee63ed9efdc7 (diff) | |
| download | linux-c0b38be14f1d843c29edc763d3df3cc741a2bf10.tar.gz linux-c0b38be14f1d843c29edc763d3df3cc741a2bf10.tar.bz2 linux-c0b38be14f1d843c29edc763d3df3cc741a2bf10.zip | |
ASoC: Pull in fixes
Cleanups for the dmaengine code build on top of current fixes.
Diffstat (limited to 'sound/soc/codecs/wm8960.c')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index 92fcd335c5de..8c8f32b23083 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c @@ -14,6 +14,7 @@ #include <linux/pm.h> #include <linux/clk.h> #include <linux/i2c.h> +#include <linux/acpi.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -1497,16 +1498,28 @@ static const struct i2c_device_id wm8960_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, wm8960_i2c_id); +#if defined(CONFIG_OF) static const struct of_device_id wm8960_of_match[] = { { .compatible = "wlf,wm8960", }, { } }; MODULE_DEVICE_TABLE(of, wm8960_of_match); +#endif + +#if defined(CONFIG_ACPI) +static const struct acpi_device_id wm8960_acpi_match[] = { + { "1AEC8960", 0 }, /* Wolfson PCI ID + part ID */ + { "10138960", 0 }, /* Cirrus Logic PCI ID + part ID */ + { }, +}; +MODULE_DEVICE_TABLE(acpi, wm8960_acpi_match); +#endif static struct i2c_driver wm8960_i2c_driver = { .driver = { .name = "wm8960", - .of_match_table = wm8960_of_match, + .of_match_table = of_match_ptr(wm8960_of_match), + .acpi_match_table = ACPI_PTR(wm8960_acpi_match), }, .probe_new = wm8960_i2c_probe, .remove = wm8960_i2c_remove, |