| From d40566a2e9aa3c40be313b1fba9d5435c58ffd79 Mon Sep 17 00:00:00 2001 |
| From: Shengjiu Wang <shengjiu.wang@nxp.com> |
| Date: Thu, 23 Nov 2017 13:32:13 +0800 |
| Subject: [PATCH] MLK-16929-1: ASoC: fsl_sai: add bitclk_freq |
| |
| Allow set SAI bit clock frequency trough snd_soc_dai_set_sysclk |
| function call on machine sound drivers. |
| |
| Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com> |
| Signed-off-by: Adrian Alonso <adrian.alonso@nxp.com> |
| --- |
| sound/soc/fsl/fsl_sai.c | 9 ++++++++- |
| sound/soc/fsl/fsl_sai.h | 1 + |
| 2 files changed, 9 insertions(+), 1 deletion(-) |
| |
| --- a/sound/soc/fsl/fsl_sai.c |
| +++ b/sound/soc/fsl/fsl_sai.c |
| @@ -233,11 +233,14 @@ static int fsl_sai_set_dai_sysclk_tr(str |
| static int fsl_sai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, |
| int clk_id, unsigned int freq, int dir) |
| { |
| + struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai); |
| int ret; |
| |
| if (dir == SND_SOC_CLOCK_IN) |
| return 0; |
| |
| + sai->bitclk_freq = freq; |
| + |
| ret = fsl_sai_set_dai_sysclk_tr(cpu_dai, clk_id, freq, |
| FSL_FMT_TRANSMITTER); |
| if (ret) { |
| @@ -500,7 +503,11 @@ static int fsl_sai_hw_params(struct snd_ |
| slot_width = sai->slot_width; |
| |
| if (!sai->slave_mode[tx]) { |
| - ret = fsl_sai_set_bclk(cpu_dai, tx, |
| + if (sai->bitclk_freq) |
| + ret = fsl_sai_set_bclk(cpu_dai, tx, |
| + sai->bitclk_freq); |
| + else |
| + ret = fsl_sai_set_bclk(cpu_dai, tx, |
| slots * slot_width * params_rate(params)); |
| if (ret) |
| return ret; |
| --- a/sound/soc/fsl/fsl_sai.h |
| +++ b/sound/soc/fsl/fsl_sai.h |
| @@ -181,6 +181,7 @@ struct fsl_sai { |
| unsigned int mclk_streams; |
| unsigned int slots; |
| unsigned int slot_width; |
| + unsigned int bitclk_freq; |
| |
| struct snd_soc_dai_driver cpu_dai_drv; |
| struct snd_dmaengine_dai_dma_data dma_params_rx; |