linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jerome Brunet <jbrunet@baylibre.com>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
	Stephen Boyd <sboyd@kernel.org>
Subject: [PATCH 3/5] ASoC: rt5682: clock driver must use the clock provider API
Date: Sat, 10 Apr 2021 13:13:54 +0200	[thread overview]
Message-ID: <20210410111356.467340-4-jbrunet@baylibre.com> (raw)
In-Reply-To: <20210410111356.467340-1-jbrunet@baylibre.com>

Clock drivers ops should not the clk API but the clock provider (clk_hw)
instead.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 sound/soc/codecs/rt5682.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index 0e2a10ed11da..2eee02ac8d49 100644
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -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);
-- 
2.30.2


  parent reply	other threads:[~2021-04-10 11:14 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-10 11:13 [PATCH 0/5] ASoC: clock provider clean-up Jerome Brunet
2021-04-10 11:13 ` [PATCH 1/5] ASoC: stm32: properly get clk from the provider Jerome Brunet
2021-04-12 20:25   ` Stephen Boyd
2021-04-10 11:13 ` [PATCH 2/5] ASoC: wcd934x: use the clock provider API Jerome Brunet
2021-04-12 20:26   ` Stephen Boyd
2021-04-10 11:13 ` Jerome Brunet [this message]
2021-04-12 20:27   ` [PATCH 3/5] ASoC: rt5682: clock driver must " Stephen Boyd
2021-04-13  7:31     ` Jerome Brunet
2021-04-10 11:13 ` [PATCH 4/5] ASoC: lpass: " Jerome Brunet
2021-04-12  9:38   ` Srinivas Kandagatla
2021-04-12 12:17     ` Jerome Brunet
2021-04-12 13:55       ` Srinivas Kandagatla
2021-04-10 11:13 ` [PATCH 5/5] ASoC: da7219: properly get clk from the provider Jerome Brunet
2021-04-12 20:27   ` Stephen Boyd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210410111356.467340-4-jbrunet@baylibre.com \
    --to=jbrunet@baylibre.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sboyd@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).