From ef2884804645115c49892409020629a96544b589 Mon Sep 17 00:00:00 2001 From: Angshuman Dasgupta Date: Wed, 28 Sep 2011 20:21:04 +0530 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32393 Reviewed-by: Roger NILSSON1 --- sound/soc/ux500/ux500_msp_dai.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'sound') 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; -- cgit v1.2.3