diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-27 15:45:54 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-27 15:45:54 +0300 |
| commit | 38e3c63da388f25c0b472a6624eb005076ea0dfb (patch) | |
| tree | 99cf9b3ff34018cf5ed32fd8b6288c94c64b1db6 /sound | |
| parent | 5d8cf7688ede7128ebdad8741ed5bdea0f2cd637 (diff) | |
| parent | f5cc17720b61af382a053d49a4a14c3d14857a5b (diff) | |
| download | linux-38e3c63da388f25c0b472a6624eb005076ea0dfb.tar.xz | |
Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/tlv320aic31xx.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index ee4def4f819f..3c5e1df01c19 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -28,6 +28,7 @@ #include <linux/i2c.h> #include <linux/gpio.h> #include <linux/regulator/consumer.h> +#include <linux/acpi.h> #include <linux/of.h> #include <linux/of_gpio.h> #include <linux/slab.h> @@ -1280,10 +1281,19 @@ static const struct i2c_device_id aic31xx_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id); +#ifdef CONFIG_ACPI +static const struct acpi_device_id aic31xx_acpi_match[] = { + { "10TI3100", 0 }, + { } +}; +MODULE_DEVICE_TABLE(acpi, aic31xx_acpi_match); +#endif + static struct i2c_driver aic31xx_i2c_driver = { .driver = { .name = "tlv320aic31xx-codec", .of_match_table = of_match_ptr(tlv320aic31xx_of_match), + .acpi_match_table = ACPI_PTR(aic31xx_acpi_match), }, .probe = aic31xx_i2c_probe, .remove = aic31xx_i2c_remove, |