fsl_asrc currently uses hardcoded input and output clocks, preventing
its use for anything other than S/PDIF output.

This patch adds the ability to select any clock as input or output (by
using new DT properties), making it possible to use this peripheral in a
more advanced way.

Signed-off-by: Arnaud Ferraris <arnaud.ferra...@collabora.com>
---
 sound/soc/fsl/fsl_asrc.c        | 18 ++++++++++++++++--
 sound/soc/fsl/fsl_asrc_common.h |  3 +++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index 95f6a9617b0b..75df220e4b51 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -605,8 +605,8 @@ static int fsl_asrc_dai_hw_params(struct snd_pcm_substream 
*substream,
 
        config.pair = pair->index;
        config.channel_num = channels;
-       config.inclk = INCLK_NONE;
-       config.outclk = OUTCLK_ASRCK1_CLK;
+       config.inclk = asrc->inclk;
+       config.outclk = asrc->outclk;
 
        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                config.input_format   = params_format(params);
@@ -1067,6 +1067,20 @@ static int fsl_asrc_probe(struct platform_device *pdev)
 
        asrc->channel_avail = 10;
 
+       ret = of_property_read_u32(np, "fsl,asrc-input-clock",
+                                  &asrc->inclk);
+       if (ret) {
+               dev_info(&pdev->dev, "no input clock specified, using none\n");
+               asrc->inclk = INCLK_NONE;
+       }
+
+       ret = of_property_read_u32(np, "fsl,asrc-output-clock",
+                                  &asrc->outclk);
+       if (ret) {
+               dev_info(&pdev->dev, "no output clock specified, using 
default\n");
+               asrc->outclk = OUTCLK_ASRCK1_CLK;
+       }
+
        ret = of_property_read_u32(np, "fsl,asrc-rate",
                                   &asrc->asrc_rate);
        if (ret) {
diff --git a/sound/soc/fsl/fsl_asrc_common.h b/sound/soc/fsl/fsl_asrc_common.h
index 7e1c13ca37f1..1468878fbaca 100644
--- a/sound/soc/fsl/fsl_asrc_common.h
+++ b/sound/soc/fsl/fsl_asrc_common.h
@@ -89,6 +89,9 @@ struct fsl_asrc {
        struct fsl_asrc_pair *pair[PAIR_CTX_NUM];
        unsigned int channel_avail;
 
+       enum asrc_inclk inclk;
+       enum asrc_outclk outclk;
+
        int asrc_rate;
        snd_pcm_format_t asrc_format;
        bool use_edma;
-- 
2.27.0

Reply via email to