diff options
| author | roger nilsson <roger.xr.nilsson@stericsson.com> | 2011-12-05 13:08:59 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:02 +0200 |
| commit | e840431742d3fb90b3e396204b1a03e76920e879 (patch) | |
| tree | f0d4a6cfef95119efa07788c494bd2db720506d6 /sound/soc/codecs | |
| parent | e70300f59baa832307a36807b26da8e6b69da151 (diff) | |
misc: Remove obsolete header file
The msp_i2s header file was a
duplicate to:
arch/arm/mach-ux500/include/mach/msp.h
The asoc drivers now use the correct
header file.
ST-Ericsson ID: 361991
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: NA
Change-Id: I8bd4e67ba149b12f9008012d98cb6d0c8481c5a4
Signed-off-by: roger nilsson <roger.xr.nilsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/41032
Reviewed-by: QABUILD
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/av8100_audio.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/cg29xx.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c index 3bc13ef1f4e..078e068b728 100644 --- a/sound/soc/codecs/ab8500_audio.c +++ b/sound/soc/codecs/ab8500_audio.c @@ -2589,7 +2589,7 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; case SND_SOC_DAIFMT_DSP_A: /* L data MSB after FRM LRC */ pr_debug("%s: IF0 Protocol: DSP A (TDM)\n", __func__); - set_mask |= BMASK(REG_DIGIFCONF2_IF0FORMAT1); + set_mask |= BMASK(REG_DIGIFCONF2_IF0FORMAT0); break; case SND_SOC_DAIFMT_DSP_B: /* L data MSB during FRM LRC */ pr_debug("%s: IF0 Protocol: DSP B (TDM)\n", __func__); diff --git a/sound/soc/codecs/av8100_audio.c b/sound/soc/codecs/av8100_audio.c index 2b4b526cfe1..bca5b7a4329 100644 --- a/sound/soc/codecs/av8100_audio.c +++ b/sound/soc/codecs/av8100_audio.c @@ -342,7 +342,7 @@ static int av8100_codec_set_dai_fmt(struct snd_soc_dai *codec_dai, /* Set the audio input format of AV8100 */ config.audio_input_format.audio_input_if_format = - ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_DSP_B) ? + ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_DSP_A) ? AV8100_AUDIO_TDM_MODE : AV8100_AUDIO_I2SDELAYED_MODE; config.audio_input_format.audio_if_mode = ((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM) ? diff --git a/sound/soc/codecs/cg29xx.c b/sound/soc/codecs/cg29xx.c index b5461c3e214..ec79cdae91b 100644 --- a/sound/soc/codecs/cg29xx.c +++ b/sound/soc/codecs/cg29xx.c @@ -215,7 +215,7 @@ static int cg29xx_set_dai_fmt(struct snd_soc_dai *codec_dai, dai_data->config.conf.i2s.mode = DAI_MODE_SLAVE; break; - case SND_SOC_DAIFMT_DSP_A: + case SND_SOC_DAIFMT_DSP_B: if (dai_data->config.port != PORT_1_I2S_PCM || msel == SND_SOC_DAIFMT_CBM_CFM) { pr_err("cg29xx_dai: unsupported DAI format 0x%x port=%d,msel=%d\n", |