From cd20d0ea0366470e0d64e4257fb5aa08ed0f0b4b Mon Sep 17 00:00:00 2001 From: Xingyu Wu Date: Tue, 11 Oct 2022 21:11:39 +0800 Subject: [PATCH] sound:starfive:Change the order about mclk_ext's operation Change the order about setting parent to mclk_ext after resets when PDM registering. Signed-off-by: Xingyu Wu --- sound/soc/starfive/starfive_pdm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 sound/soc/starfive/starfive_pdm.c diff --git a/sound/soc/starfive/starfive_pdm.c b/sound/soc/starfive/starfive_pdm.c old mode 100755 new mode 100644 index 89f539c..d6c10d6 --- a/sound/soc/starfive/starfive_pdm.c +++ b/sound/soc/starfive/starfive_pdm.c @@ -296,12 +296,6 @@ static int sf_pdm_clock_init(struct platform_device *pdev, struct sf_pdm *priv) goto exit; } - ret = clk_set_parent(priv->clk_mclk, priv->clk_mclk_ext); - if (ret) { - dev_err(&pdev->dev, "failed to set parent clk_mclk ret=%d\n", ret); - goto exit; - } - ret = clk_prepare_enable(priv->clk_mclk); if (ret) { dev_err(&pdev->dev, "failed to prepare enable clk_mclk\n"); @@ -338,6 +332,12 @@ static int sf_pdm_clock_init(struct platform_device *pdev, struct sf_pdm *priv) goto err_clk_disable; } + ret = clk_set_parent(priv->clk_mclk, priv->clk_mclk_ext); + if (ret) { + dev_err(&pdev->dev, "failed to set parent clk_mclk ret=%d\n", ret); + goto err_clk_disable; + } + return 0; err_clk_disable: -- 2.7.4