diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-11-10 02:55:55 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-11-12 04:56:22 -0500 |
commit | 4e2cc814eb2755df286ea890078fb636e1aa0f69 (patch) | |
tree | c6b7ae2d635853a1f8414a73ef1bff83ee4c263c | |
parent | a4a1d79ea75eec48e086648678b62a8220fe3723 (diff) |
ASoC: tlv320aic31xx: Add support for tlv320dac3101
The DAC3101 is mostly identical to DAC3100 with the exception that it has
stereo speaker AMP instead of mono used in DAC3100.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | 1 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320aic31xx.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/tlv320aic31xx.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt index 9340d2ddcc54..6fbba562eaa7 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | |||
@@ -12,6 +12,7 @@ Required properties: | |||
12 | "ti,tlv320aic3120" - TLV320AIC3120 (mono speaker amp, MiniDSP) | 12 | "ti,tlv320aic3120" - TLV320AIC3120 (mono speaker amp, MiniDSP) |
13 | "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP) | 13 | "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP) |
14 | "ti,tlv320dac3100" - TLV320DAC3100 (no ADC, mono speaker amp, no MiniDSP) | 14 | "ti,tlv320dac3100" - TLV320DAC3100 (no ADC, mono speaker amp, no MiniDSP) |
15 | "ti,tlv320dac3101" - TLV320DAC3101 (no ADC, stereo speaker amp, no MiniDSP) | ||
15 | 16 | ||
16 | - reg - <int> - I2C slave address | 17 | - reg - <int> - I2C slave address |
17 | - HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply, | 18 | - HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply, |
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 8880f6be3336..f8a90ba8cd71 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c | |||
@@ -1254,6 +1254,7 @@ static const struct of_device_id tlv320aic31xx_of_match[] = { | |||
1254 | { .compatible = "ti,tlv320aic3120" }, | 1254 | { .compatible = "ti,tlv320aic3120" }, |
1255 | { .compatible = "ti,tlv320aic3111" }, | 1255 | { .compatible = "ti,tlv320aic3111" }, |
1256 | { .compatible = "ti,tlv320dac3100" }, | 1256 | { .compatible = "ti,tlv320dac3100" }, |
1257 | { .compatible = "ti,tlv320dac3101" }, | ||
1257 | {}, | 1258 | {}, |
1258 | }; | 1259 | }; |
1259 | MODULE_DEVICE_TABLE(of, tlv320aic31xx_of_match); | 1260 | MODULE_DEVICE_TABLE(of, tlv320aic31xx_of_match); |
@@ -1380,6 +1381,7 @@ static const struct i2c_device_id aic31xx_i2c_id[] = { | |||
1380 | { "tlv320aic3120", AIC3120 }, | 1381 | { "tlv320aic3120", AIC3120 }, |
1381 | { "tlv320aic3111", AIC3111 }, | 1382 | { "tlv320aic3111", AIC3111 }, |
1382 | { "tlv320dac3100", DAC3100 }, | 1383 | { "tlv320dac3100", DAC3100 }, |
1384 | { "tlv320dac3101", DAC3101 }, | ||
1383 | { } | 1385 | { } |
1384 | }; | 1386 | }; |
1385 | MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id); | 1387 | MODULE_DEVICE_TABLE(i2c, aic31xx_i2c_id); |
diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index 5acd5b69fb83..730fb2058869 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h | |||
@@ -32,6 +32,7 @@ enum aic31xx_type { | |||
32 | AIC3120 = AIC31XX_MINIDSP_BIT, | 32 | AIC3120 = AIC31XX_MINIDSP_BIT, |
33 | AIC3111 = (AIC31XX_STEREO_CLASS_D_BIT | AIC31XX_MINIDSP_BIT), | 33 | AIC3111 = (AIC31XX_STEREO_CLASS_D_BIT | AIC31XX_MINIDSP_BIT), |
34 | DAC3100 = DAC31XX_BIT, | 34 | DAC3100 = DAC31XX_BIT, |
35 | DAC3101 = DAC31XX_BIT | AIC31XX_STEREO_CLASS_D_BIT, | ||
35 | }; | 36 | }; |
36 | 37 | ||
37 | struct aic31xx_pdata { | 38 | struct aic31xx_pdata { |