diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-29 13:37:27 +0100 |
| commit | 1ce286b9c9bd08875072a7c3c6a43ef2a2ea4a71 (patch) | |
| tree | 94e13e0fbe60a088e76a14cfee69346152efe336 /sound | |
| parent | 49422ad37d90945fe9ad0220d9505e2be6168777 (diff) | |
| parent | 53f9b3baa937e0cbdd75ea11b3c824462e4359b2 (diff) | |
| download | linux-stable-1ce286b9c9bd08875072a7c3c6a43ef2a2ea4a71.tar.gz linux-stable-1ce286b9c9bd08875072a7c3c6a43ef2a2ea4a71.tar.bz2 linux-stable-1ce286b9c9bd08875072a7c3c6a43ef2a2ea4a71.zip | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5645.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index 69528ae5410c..be4d741c45ba 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -18,6 +18,7 @@ #include <linux/platform_device.h> #include <linux/spi/spi.h> #include <linux/gpio.h> +#include <linux/acpi.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -2656,6 +2657,15 @@ static const struct i2c_device_id rt5645_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id); +#ifdef CONFIG_ACPI +static struct acpi_device_id rt5645_acpi_match[] = { + { "10EC5645", 0 }, + { "10EC5650", 0 }, + {}, +}; +MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match); +#endif + static int rt5645_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -2770,7 +2780,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, case RT5645_DMIC_DATA_GPIO12: regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1, - RT5645_DMIC_1_DP_MASK, RT5645_DMIC_2_DP_GPIO12); + RT5645_DMIC_2_DP_MASK, RT5645_DMIC_2_DP_GPIO12); regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1, RT5645_GP12_PIN_MASK, RT5645_GP12_PIN_DMIC2_SDA); @@ -2872,6 +2882,7 @@ static struct i2c_driver rt5645_i2c_driver = { .driver = { .name = "rt5645", .owner = THIS_MODULE, + .acpi_match_table = ACPI_PTR(rt5645_acpi_match), }, .probe = rt5645_i2c_probe, .remove = rt5645_i2c_remove, |