diff options
Diffstat (limited to 'sound/soc/ux500/ux500_msp_dai.c')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_dai.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index b1fdfa779f2..354a0edb8bf 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -18,6 +18,7 @@ #include <mach/hardware.h> #include <mach/msp.h> #include <linux/i2s/i2s.h> +#include <asm/mach-types.h> #include <sound/soc.h> #include <sound/soc-dai.h> @@ -36,7 +37,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_MSP_U8500_INTERNAL_CLOCK_FREQ, }, { .i2s = NULL, @@ -49,7 +50,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_MSP_U8500_INTERNAL_CLOCK_FREQ, }, { .i2s = NULL, @@ -62,7 +63,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_MSP_U8500_INTERNAL_CLOCK_FREQ, }, { .i2s = NULL, @@ -75,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_MSP_U8500_INTERNAL_CLOCK_FREQ, }, }; @@ -456,7 +457,11 @@ static void ux500_msp_dai_compile_msp_config(struct snd_pcm_substream *substream memset(msp_config, 0, sizeof(*msp_config)); - msp_config->input_clock_freq = private->master_clk; + if (machine_is_u5500()) + msp_config->input_clock_freq = UX500_MSP_U5500_INTERNAL_CLOCK_FREQ; + else + msp_config->input_clock_freq = private->master_clk; + msp_config->tx_fifo_config = TX_FIFO_ENABLE; msp_config->rx_fifo_config = RX_FIFO_ENABLE; msp_config->spi_clk_mode = SPI_CLK_MODE_NORMAL; |