summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAngshuman Dasgupta <angshuman.dasgupta@stericsson.com>2011-09-28 20:21:04 +0530
committerLee Jones <lee.jones@linaro.org>2012-01-05 10:03:56 +0000
commit797f2e60a6c27fe6cd81bf86f4f9ca47e29bd49e (patch)
tree25a9366805d89bbba9bdd071c57e209127c304ec /sound
parent9fcc332d30b33e1ed196984dd47bbcc869586ecd (diff)
sound: asoc: ab5500: Corrected the clock setting
This fixes the clock which was configured automatically to 13Mhz instead of being decided at run time ST-Ericsson Linux next: NA ST-Ericsson ID: 363003 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10006 Change-Id: If885d5b39c8e95d02a367a16f346aade6208f252 Signed-off-by: Angshuman Dasgupta <angshuman.dasgupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32393 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/ux500/ux500_msp_dai.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 5efc7adce85..64cf557f485 100644
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -76,7 +76,7 @@ static struct ux500_platform_drvdata platform_drvdata[UX500_NBR_OF_DAI] = {
.capture_active = false,
.configured = 0,
.data_delay = MSP_DELAY_0,
- .master_clk = UX500_MSP_INTERNAL_CLOCK_FREQ,
+ .master_clk = UX500_MSP1_INTERNAL_CLOCK_FREQ,
},
};
@@ -447,10 +447,7 @@ static void ux500_msp_dai_compile_msp_config(struct snd_pcm_substream *substream
memset(msp_config, 0, sizeof(*msp_config));
- if (machine_is_u5500())
- msp_config->input_clock_freq = UX500_MSP_INTERNAL_CLOCK_FREQ;
- else
- msp_config->input_clock_freq = private->master_clk;
+ msp_config->input_clock_freq = private->master_clk;
msp_config->tx_fifo_config = TX_FIFO_ENABLE;
msp_config->rx_fifo_config = RX_FIFO_ENABLE;