]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
ASoC: xlnx: Disable clock wizard usage in audio driver
authorMaruthi Srinivas Bayyavarapu <maruthi.srinivas.bayyavarapu@xilinx.com>
Fri, 2 Nov 2018 11:50:26 +0000 (17:20 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 7 Nov 2018 10:06:19 +0000 (11:06 +0100)
Current solution which uses clocking wizard, couldn't generate
accurate clock due to inability of clock wizard driver to program
fractional value of clock divider value. This is resulting in audio
loss in a simulataneous capture and playback audio usecase.
This patch disables its usage.

Signed-off-by: Maruthi Srinivas Bayyavarapu <maruthi.srinivas.bayyavarapu@xilinx.com>
Reviewed-by: Sandip Kothari <sandipk@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
sound/soc/xilinx/xlnx_pl_snd_card.c

index e49e01eada6da21fff3080c88c4ac25a41a85bc4..7681dac70928d20e60d0337196e462457d28b0fc 100644 (file)
@@ -148,11 +148,6 @@ static int xlnx_i2s_card_hw_params(struct snd_pcm_substream *substream,
                }
        }
 
-       prv->mclk_val = prv->mclk_ratio * sample_rate;
-       ret = clk_set_rate(prv->mclk, prv->mclk_val);
-       if (ret)
-               return ret;
-
        clk_div = DIV_ROUND_UP(prv->mclk_ratio, 2 * ch * data_width);
        ret = snd_soc_dai_set_clkdiv(cpu_dai, 0, clk_div);
 
@@ -192,7 +187,6 @@ static struct snd_soc_dai_link xlnx_snd_dai[][XLNX_MAX_PATHS] = {
                        .codec_dai_name = "i2s-hifi",
                        .codec_name = "hdmi-audio-codec.0",
                        .cpu_dai_name = "snd-soc-dummy-dai",
-                       .ops = &xlnx_hdmi_card_ops,
                },
                {
                        .name = "xilinx-hdmi-capture",
@@ -205,7 +199,6 @@ static struct snd_soc_dai_link xlnx_snd_dai[][XLNX_MAX_PATHS] = {
                        .name = "xlnx-sdi-playback",
                        .codec_dai_name = "xlnx_sdi_tx",
                        .cpu_dai_name = "snd-soc-dummy-dai",
-                       .ops = &xlnx_sdi_card_ops,
                },
                {
                        .name = "xlnx-sdi-capture",