diff options
| author | ing07300 <raghavendra.patil_2@stericsson.com> | 2011-11-13 14:21:26 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:01 +0200 |
| commit | e2655ced8152c5ddc01aabcae83814b8d11d684a (patch) | |
| tree | 78e4c807d53ebeabc8132379ace17316477b0a08 /sound | |
| parent | 4bd9f09e34e09b594843958326e10c4047b33b3c (diff) | |
Ux500 ASOC:fix incomplete reversal on AB master
This patch completes the AB5500 as master and MSP
as slave reversal that was partially done.
ST-Ericsson Linux next: 373944
ST-Ericsson ID: 373944
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006
Change-Id: I1031f1a60efcb6a5ddeb1778e2d694ceed2609bf
Signed-off-by: ing07300 <raghavendra.patil_2@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/37510
Reviewed-by: QABUILD
Tested-by: Kumar K M <kumar.km@stericsson.com>
Reviewed-by: Amaresh MULAGE <amaresh.mulage@stericsson.com>
Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ux500/ux500_ab5500.c | 5 | ||||
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/ux500/ux500_ab5500.c b/sound/soc/ux500/ux500_ab5500.c index 021ae1cd75c..76deb346cda 100644 --- a/sound/soc/ux500/ux500_ab5500.c +++ b/sound/soc/ux500/ux500_ab5500.c @@ -46,15 +46,14 @@ int ux500_ab5500_hw_params(struct snd_pcm_substream *substream, printk(KERN_DEBUG "%s: DAI-index (Platform): %d\n", __func__, cpu_dai->id); ret = snd_soc_dai_set_fmt(codec_dai, - SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM); + SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS); if (ret < 0) return ret; ret = snd_soc_dai_set_fmt(cpu_dai, - SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM); + SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS); if (ret < 0) return ret; - ux500_msp_dai_set_data_delay(cpu_dai, MSP_DELAY_1); return ret; } diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index a99e56ce234..8ff8b9dbdd8 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -351,6 +351,7 @@ static void ux500_msp_dai_setup_clocking(unsigned int fmt, msp_config->rx_frame_sync_pol = MSP_FRAME_SYNC_POL_ACTIVE_LOW << RFSPOL_SHIFT; break; + } if ((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM) { @@ -362,7 +363,6 @@ static void ux500_msp_dai_setup_clocking(unsigned int fmt, msp_config->tx_clock_sel = 0; msp_config->rx_clock_sel = 0; msp_config->srg_clock_sel = 0x2 << SCKSEL_SHIFT; - msp_config->iodelay = 0x20; } else { pr_debug("%s: Codec is SLAVE.\n", @@ -427,8 +427,8 @@ static void ux500_msp_dai_compile_prot_desc_i2s(struct msp_protocol_desc *prot_d prot_desc->tx_element_length_1 = MSP_ELEM_LENGTH_16; prot_desc->tx_element_length_2 = MSP_ELEM_LENGTH_16; - prot_desc->rx_clock_pol = MSP_FALLING_EDGE; - prot_desc->tx_clock_pol = MSP_FALLING_EDGE; + prot_desc->rx_clock_pol = MSP_RISING_EDGE; + prot_desc->tx_clock_pol = MSP_RISING_EDGE; prot_desc->tx_half_word_swap = MSP_HWS_NO_SWAP; prot_desc->rx_half_word_swap = MSP_HWS_NO_SWAP; |