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/ux500/ux500_av8100.c | |
| 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/ux500/ux500_av8100.c')
| -rw-r--r-- | sound/soc/ux500/ux500_av8100.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/ux500/ux500_av8100.c b/sound/soc/ux500/ux500_av8100.c index a1be8d15c72..becf81a07e0 100644 --- a/sound/soc/ux500/ux500_av8100.c +++ b/sound/soc/ux500/ux500_av8100.c @@ -112,7 +112,7 @@ static int ux500_av8100_hw_params(struct snd_pcm_substream *substream, } /* Set format for codec-DAI */ - fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM; + fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBM_CFM; pr_debug("%s: Setting format for codec-DAI (fmt = %d).\n", __func__, fmt); @@ -139,7 +139,7 @@ static int ux500_av8100_hw_params(struct snd_pcm_substream *substream, } /* Set format for CPU-DAI */ - fmt = SND_SOC_DAIFMT_DSP_B | + fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBM_CFM | SND_SOC_DAIFMT_NB_IF; pr_debug("%s: Setting DAI-format for Ux500-platform (fmt = %d).\n", @@ -154,8 +154,6 @@ static int ux500_av8100_hw_params(struct snd_pcm_substream *substream, return ret; } - ux500_msp_dai_set_data_delay(cpu_dai, MSP_DELAY_1); - return ret; } |