diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:53 +0100 |
| commit | f9061f2fc1e66264597c36ebb084fb8c35117e67 (patch) | |
| tree | 71a13791325d384c524c1d321155e37b9497d186 /sound/soc/codecs/tlv320aic3x.c | |
| parent | 2291d2691473e9f4655e74cd1ae03c9e05fed6fd (diff) | |
| parent | cbaa56896146cbb5ab54bd65f98d020af282e6c6 (diff) | |
| download | linux-f9061f2fc1e66264597c36ebb084fb8c35117e67.tar.gz linux-f9061f2fc1e66264597c36ebb084fb8c35117e67.tar.bz2 linux-f9061f2fc1e66264597c36ebb084fb8c35117e67.zip | |
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index fec0db04262d..6e3f269243e0 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1474,6 +1474,7 @@ static const struct i2c_device_id aic3x_i2c_id[] = { { "tlv320aic3x", AIC3X_MODEL_3X }, { "tlv320aic33", AIC3X_MODEL_33 }, { "tlv320aic3007", AIC3X_MODEL_3007 }, + { "tlv320aic3106", AIC3X_MODEL_3X }, { } }; MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id); @@ -1564,6 +1565,9 @@ static int aic3x_i2c_remove(struct i2c_client *client) #if defined(CONFIG_OF) static const struct of_device_id tlv320aic3x_of_match[] = { { .compatible = "ti,tlv320aic3x", }, + { .compatible = "ti,tlv320aic33" }, + { .compatible = "ti,tlv320aic3007" }, + { .compatible = "ti,tlv320aic3106" }, {}, }; MODULE_DEVICE_TABLE(of, tlv320aic3x_of_match); |