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_cg29xx.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_cg29xx.c')
| -rw-r--r-- | sound/soc/ux500/ux500_cg29xx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/ux500/ux500_cg29xx.c b/sound/soc/ux500/ux500_cg29xx.c index 8301a80f54d..bb95bc2c306 100644 --- a/sound/soc/ux500/ux500_cg29xx.c +++ b/sound/soc/ux500/ux500_cg29xx.c @@ -19,7 +19,7 @@ #define UX500_CG29XX_MSP_CLOCK_FREQ 18900000 #define UX500_CG29XX_DAI_SLOT_WIDTH 16 #define UX500_CG29XX_DAI_SLOTS 2 -#define UX500_CG29XX_DAI_ACTIVE_SLOTS 0x01 +#define UX500_CG29XX_DAI_ACTIVE_SLOTS 0x02 int ux500_cg29xx_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) @@ -40,7 +40,7 @@ int ux500_cg29xx_hw_params(struct snd_pcm_substream *substream, pr_debug("%s: DAI-index (Platform): %d\n", __func__, cpu_dai->id); err = snd_soc_dai_set_fmt(codec_dai, - SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBS_CFS); + SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBS_CFS); if (err) { pr_err("%s: snd_soc_dai_set_fmt(codec) failed with %d.\n", @@ -63,7 +63,7 @@ int ux500_cg29xx_hw_params(struct snd_pcm_substream *substream, } err = snd_soc_dai_set_fmt(cpu_dai, - SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBS_CFS | + SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_NB_NF); if (err) { @@ -148,7 +148,7 @@ int u5500_cg29xx_hw_params(struct snd_pcm_substream *substream, } } else { err = snd_soc_dai_set_fmt(codec_dai, - SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_CBS_CFS); + SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBS_CFS); if (err) { pr_err("%s: snd_soc_dai_set_fmt(codec) failed with %d.\n", __func__, @@ -170,7 +170,7 @@ int u5500_cg29xx_hw_params(struct snd_pcm_substream *substream, } err = snd_soc_dai_set_fmt(cpu_dai, - SND_SOC_DAIFMT_DSP_A | + SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBS_CFS | SND_SOC_DAIFMT_NB_NF); |