summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-01-18 11:55:39 +0000
committerMark Brown <broonie@kernel.org>2018-01-18 11:55:39 +0000
commite2ab6dd50e02f6f59b2f4f321d25bff481de16db (patch)
tree6cde09fa44e31a5a1d9b498dac4f3214fa87c4b4 /sound
parent078b3a0205cba12302d40ce04a24c0edaa6842ce (diff)
parentdb51707b9c9aeedd310ebce60f15d5bb006567e0 (diff)
downloadlinux-e2ab6dd50e02f6f59b2f4f321d25bff481de16db.tar.gz
linux-e2ab6dd50e02f6f59b2f4f321d25bff481de16db.tar.bz2
linux-e2ab6dd50e02f6f59b2f4f321d25bff481de16db.zip
Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/rockchip/rockchip_i2s.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c
index eb27f6c24bf7..950823d69e9c 100644
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
@@ -328,6 +328,7 @@ static int rockchip_i2s_hw_params(struct snd_pcm_substream *substream,
val |= I2S_CHN_4;
break;
case 2:
+ case 1:
val |= I2S_CHN_2;
break;
default:
@@ -460,7 +461,7 @@ static struct snd_soc_dai_driver rockchip_i2s_dai = {
},
.capture = {
.stream_name = "Capture",
- .channels_min = 2,
+ .channels_min = 1,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_8000_192000,
.formats = (SNDRV_PCM_FMTBIT_S8 |
@@ -660,7 +661,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
}
if (!of_property_read_u32(node, "rockchip,capture-channels", &val)) {
- if (val >= 2 && val <= 8)
+ if (val >= 1 && val <= 8)
soc_dai->capture.channels_max = val;
}