aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/kirkwood/kirkwood-i2s.c
diff options
context:
space:
mode:
authorarnaud.patard@rtp-net.org <arnaud.patard@rtp-net.org>2010-07-11 17:28:31 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-13 07:37:09 -0400
commitdfe4c93627c4a1a7fb7e30b15e31f4ccf3ca60f5 (patch)
tree2570b4c9c193bd4857e0984345dd57bd6258ff47 /sound/soc/kirkwood/kirkwood-i2s.c
parentccad7b44ccdc8341c1449bc5b864b42b197f8c2e (diff)
ASoC: Fix kirkwood i2s mono playback
Kirkwood controller needs to be informed if the audio stream is mono or not. Failing to do so will result in playing at the wrong speed. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/kirkwood/kirkwood-i2s.c')
-rw-r--r--sound/soc/kirkwood/kirkwood-i2s.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 0fdc7db7a469..d80ea1ff7b0e 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -153,6 +153,15 @@ static int kirkwood_i2s_hw_params(struct snd_pcm_substream *substream,
153 default: 153 default:
154 return -EINVAL; 154 return -EINVAL;
155 } 155 }
156
157 if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
158 value &= ~KIRKWOOD_PLAYCTL_MONO_MASK;
159 if (params_channels(params) == 1)
160 value |= KIRKWOOD_PLAYCTL_MONO_BOTH;
161 else
162 value |= KIRKWOOD_PLAYCTL_MONO_OFF;
163 }
164
156 writel(i2s_value, priv->io+i2s_reg); 165 writel(i2s_value, priv->io+i2s_reg);
157 writel(value, priv->io+reg); 166 writel(value, priv->io+reg);
158 167