summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViorel Suman <viorel.suman@nxp.com>2018-02-08 12:47:24 +0200
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:30:38 +0800
commite8996af70a35d2af73d20fa6afe0b9f11a105076 (patch)
treea0f4e6905c05ff1d7eb8f2f924ebc4e65879cd48
parent115c25c2fcbc7783dcbebe9bebc7afd6dd680a75 (diff)
MLK-17528-1: ASoC: fsl_sai: Introduce FSL_SAI_CLK_BIT clock id
Introduce FSL_SAI_CLK_BIT clock id in order to distinguish the bit clock and master clocks in "set_sysclk" API. Signed-off-by: Viorel Suman <viorel.suman@nxp.com> Suggested-by: Shengjiu Wang <shengjiu.wang@nxp.com> Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
-rw-r--r--sound/soc/fsl/fsl_sai.c5
-rw-r--r--sound/soc/fsl/fsl_sai.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index c9fd1e1fcc9d..57b13a525c89 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -246,7 +246,10 @@ static int fsl_sai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
if (dir == SND_SOC_CLOCK_IN)
return 0;
- sai->bitclk_freq = freq;
+ if (clk_id == FSL_SAI_CLK_BIT) {
+ sai->bitclk_freq = freq;
+ return 0;
+ }
ret = fsl_sai_set_dai_sysclk_tr(cpu_dai, clk_id, freq,
FSL_FMT_TRANSMITTER);
diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
index da458e771288..d872c2f0e89e 100644
--- a/sound/soc/fsl/fsl_sai.h
+++ b/sound/soc/fsl/fsl_sai.h
@@ -165,6 +165,7 @@
#define FSL_SAI_CLK_MAST3 3
#define FSL_SAI_MCLK_MAX 4
+#define FSL_SAI_CLK_BIT 5
/* SAI data transfer numbers per DMA request */
#define FSL_SAI_MAXBURST_TX 6