summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 11:06:18 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-11 11:06:18 +0000
commitdd31f591011f83f74344dcb2e63c67348b61db9a (patch)
treee2f2daede55062588c1df51df10d0d539d265b70 /sound/soc/codecs
parent89bc3f2c931811fdcf0f9c88dac9d5434d120e8e (diff)
parent06378da45d58fc3703ce5243c7b278aa8cfadb61 (diff)
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-next
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/tlv320aic3x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 5708a973a77..49891432af7 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1210,13 +1210,13 @@ static struct snd_soc_dai_driver aic3x_dai = {
.name = "tlv320aic3x-hifi",
.playback = {
.stream_name = "Playback",
- .channels_min = 1,
+ .channels_min = 2,
.channels_max = 2,
.rates = AIC3X_RATES,
.formats = AIC3X_FORMATS,},
.capture = {
.stream_name = "Capture",
- .channels_min = 1,
+ .channels_min = 2,
.channels_max = 2,
.rates = AIC3X_RATES,
.formats = AIC3X_FORMATS,},