summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorroger nilsson <roger.xr.nilsson@stericsson.com>2011-11-10 19:19:13 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:05:00 +0200
commit4ac412d03f614b1530494b0ff19bbbfc13697f05 (patch)
treeec2c3e07b7193286fa0b30404e1b479fa6eb20ec /sound
parent1c666609904fbf980c3e9aa0d05996f3d7239248 (diff)
Ux500 ASOC: Correct faulty MSP settings
The polarity and enable bits were not correctly set when codec was master. ST-Ericsson ID: 361991 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: I37a1953943a1f0c1077f86d8c0936ddbd2c7e85b Signed-off-by: roger nilsson <roger.xr.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/37374 Reviewed-by: QATOOLS Reviewed-by: QABUILD
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/ux500/ux500_msp_dai.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index ad698d979f6..a99e56ce234 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -362,14 +362,7 @@ 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;
- msp_config->protocol_desc.tx_clock_pol = 1;
- msp_config->tx_fifo_config = 1 << TFFEN_SHIFT;
- msp_config->tx_frame_sync_pol = 1 << TFSPOL_SHIFT;
- msp_config->protocol_desc.rx_clock_pol = 1;
- msp_config->rx_fifo_config = 1 << RFFEN_SHIFT;
- msp_config->rx_frame_sync_pol = 1 << RFSPOL_SHIFT;
} else {
pr_debug("%s: Codec is SLAVE.\n",
@@ -434,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_RISING_EDGE;
- prot_desc->tx_clock_pol = MSP_RISING_EDGE;
+ prot_desc->rx_clock_pol = MSP_FALLING_EDGE;
+ prot_desc->tx_clock_pol = MSP_FALLING_EDGE;
prot_desc->tx_half_word_swap = MSP_HWS_NO_SWAP;
prot_desc->rx_half_word_swap = MSP_HWS_NO_SWAP;