From: Jerome Brunet <jbrunet@baylibre.com>
To: Mark Brown <broonie@kernel.org>
Cc: Jerome Brunet <jbrunet@baylibre.com>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Stephen Boyd <sboyd@kernel.org>
Subject: [PATCH v2 3/5] ASoC: rt5682: clock driver must use the clock provider API
Date: Wed, 21 Apr 2021 14:05:10 +0200 [thread overview]
Message-ID: <20210421120512.413057-4-jbrunet@baylibre.com> (raw)
In-Reply-To: <20210421120512.413057-1-jbrunet@baylibre.com>
Clock drivers ops should not call 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 a5aacfe01a0d..e4c91571abae 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.31.1
next prev parent reply other threads:[~2021-04-21 12:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-21 12:05 [PATCH v2 0/5] ASoC: clock provider clean-up Jerome Brunet
2021-04-21 12:05 ` [PATCH v2 1/5] ASoC: stm32: properly get clk from the provider Jerome Brunet
2021-04-21 12:05 ` [PATCH v2 2/5] ASoC: wcd934x: use the clock provider API Jerome Brunet
2021-04-21 12:05 ` Jerome Brunet [this message]
2021-04-21 12:05 ` [PATCH v2 4/5] ASoC: lpass: " Jerome Brunet
2021-04-21 12:05 ` [PATCH v2 5/5] ASoC: da7219: properly get clk from the provider Jerome Brunet
2021-04-26 18:10 ` Pierre-Louis Bossart
2021-04-26 18:39 ` Pierre-Louis Bossart
2021-04-26 19:35 ` Jerome Brunet
2021-04-27 9:16 ` Jerome Brunet
2021-04-27 10:27 ` Mark Brown
2021-04-27 11:33 ` Jerome Brunet
2021-04-23 18:06 ` [PATCH v2 0/5] ASoC: clock provider clean-up Mark Brown
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=20210421120512.413057-4-jbrunet@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--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
all inboxes | Powered by JetHome®