summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2009-06-01 14:06:40 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-01 23:46:08 +0100
commiteaf1ac8bb58888e0773c0b81dfedb9d7c0123a1d (patch)
treea12e7bf7e9a4d1b8a71444aaf70d5c4423b1fd31 /sound/soc
parent16a30fbb0d3aa4ee829a2dd3d0e314e2b5ae96a9 (diff)
downloadblackbird-op-linux-eaf1ac8bb58888e0773c0b81dfedb9d7c0123a1d.tar.gz
blackbird-op-linux-eaf1ac8bb58888e0773c0b81dfedb9d7c0123a1d.zip
ASoC: TWL4030: Check the interface format for 4 channel mode
In addition to the operating mode check, also check the codec's interface format in case of four channel mode. If the codec is not in TDM (DSP_A) mode, return with error. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/twl4030.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index df474a5dd357..c53c7cabbd27 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1608,9 +1608,15 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream,
/* If the substream has 4 channel, do the necessary setup */
if (params_channels(params) == 4) {
- /* Safety check: are we in the correct operating mode? */
- if ((twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE) &
- TWL4030_OPTION_1))
+ u8 format, mode;
+
+ format = twl4030_read_reg_cache(codec, TWL4030_REG_AUDIO_IF);
+ mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE);
+
+ /* Safety check: are we in the correct operating mode and
+ * the interface is in TDM mode? */
+ if ((mode & TWL4030_OPTION_1) &&
+ ((format & TWL4030_AIF_FORMAT) == TWL4030_AIF_FORMAT_TDM))
twl4030_tdm_enable(codec, substream->stream, 1);
else
return -EINVAL;
OpenPOWER on IntegriCloud