ASoC: rt5682: clock driver must use the clock provider API
authorJerome Brunet <jbrunet@baylibre.com>
Wed, 21 Apr 2021 12:05:10 +0000 (14:05 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 23 Apr 2021 12:16:25 +0000 (13:16 +0100)
Clock drivers ops should not call the clk API but the clock provider
(clk_hw) instead.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20210421120512.413057-4-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5682.c

index a5aacfe..e4c9157 100644 (file)
@@ -2634,7 +2634,7 @@ static int rt5682_wclk_set_rate(struct clk_hw *hw, unsigned long rate,
                container_of(hw, struct rt5682_priv,
                             dai_clks_hw[RT5682_DAI_WCLK_IDX]);
        struct snd_soc_component *component = rt5682->component;
-       struct clk *parent_clk;
+       struct clk_hw *parent_hw;
        const char * const clk_name = clk_hw_get_name(hw);
        int pre_div;
        unsigned int clk_pll2_out;
@@ -2649,8 +2649,8 @@ static int rt5682_wclk_set_rate(struct clk_hw *hw, unsigned long rate,
         *
         * It will set the codec anyway by assuming mclk is 48MHz.
         */
-       parent_clk = clk_get_parent(hw->clk);
-       if (!parent_clk)
+       parent_hw = clk_hw_get_parent(hw);
+       if (!parent_hw)
                dev_warn(component->dev,
                        "Parent mclk of wclk not acquired in driver. Please ensure mclk was provided as %d Hz.\n",
                        CLK_PLL2_FIN);