From: Samuel Holland <samuel@sholland.org>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>
Cc: Ondrej Jirman <megous@megous.com>,
alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Samuel Holland <samuel@sholland.org>
Subject: [PATCH 8/9] ASoC: sun8i-codec: Attach the bus clock to the regmap
Date: Sun, 30 Aug 2020 22:48:51 -0500 [thread overview]
Message-ID: <20200831034852.18841-9-samuel@sholland.org> (raw)
In-Reply-To: <20200831034852.18841-1-samuel@sholland.org>
When attached to the regmap, the bus clock is automatically enabled as
needed to access device registers. This avoids needing code to manage it
separately in the driver.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
sound/soc/sunxi/sun8i-codec.c | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index c25cdd3f3057..8a7f98910347 100644
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -94,7 +94,6 @@ struct sun8i_codec_quirks {
struct sun8i_codec {
struct regmap *regmap;
struct clk *clk_module;
- struct clk *clk_bus;
const struct sun8i_codec_quirks *quirks;
};
@@ -109,12 +108,6 @@ static int sun8i_codec_runtime_resume(struct device *dev)
return ret;
}
- ret = clk_prepare_enable(scodec->clk_bus);
- if (ret) {
- dev_err(dev, "Failed to enable the bus clock\n");
- goto err_disable_modclk;
- }
-
regcache_cache_only(scodec->regmap, false);
ret = regcache_sync(scodec->regmap);
@@ -126,9 +119,6 @@ static int sun8i_codec_runtime_resume(struct device *dev)
return 0;
err_disable_clk:
- clk_disable_unprepare(scodec->clk_bus);
-
-err_disable_modclk:
clk_disable_unprepare(scodec->clk_module);
return ret;
@@ -142,7 +132,6 @@ static int sun8i_codec_runtime_suspend(struct device *dev)
regcache_mark_dirty(scodec->regmap);
clk_disable_unprepare(scodec->clk_module);
- clk_disable_unprepare(scodec->clk_bus);
return 0;
}
@@ -612,20 +601,14 @@ static int sun8i_codec_probe(struct platform_device *pdev)
return PTR_ERR(scodec->clk_module);
}
- scodec->clk_bus = devm_clk_get(&pdev->dev, "bus");
- if (IS_ERR(scodec->clk_bus)) {
- dev_err(&pdev->dev, "Failed to get the bus clock\n");
- return PTR_ERR(scodec->clk_bus);
- }
-
base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base)) {
dev_err(&pdev->dev, "Failed to map the registers\n");
return PTR_ERR(base);
}
- scodec->regmap = devm_regmap_init_mmio(&pdev->dev, base,
- &sun8i_codec_regmap_config);
+ scodec->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "bus", base,
+ &sun8i_codec_regmap_config);
if (IS_ERR(scodec->regmap)) {
dev_err(&pdev->dev, "Failed to create our regmap\n");
return PTR_ERR(scodec->regmap);
--
2.26.2
next prev parent reply other threads:[~2020-08-31 3:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 3:48 [PATCH 0/9] ASoC: sun8i-codec driver cleanup Samuel Holland
2020-08-31 3:48 ` [PATCH 1/9] ASoC: sun8i-codec: Remove extraneous widgets Samuel Holland
2020-08-31 3:48 ` [PATCH 2/9] ASoC: sun8i-codec: Fix AIF1 MODCLK widget name Samuel Holland
2020-08-31 3:48 ` [PATCH 3/9] ASoC: sun8i-codec: Fix AIF1_ADCDAT_CTRL field names Samuel Holland
2020-08-31 3:48 ` [PATCH 4/9] ASoC: sun8i-codec: Fix AIF1_MXR_SRC " Samuel Holland
2020-08-31 3:48 ` [PATCH 5/9] ASoC: sun8i-codec: Fix ADC_DIG_CTRL field name Samuel Holland
2020-08-31 3:48 ` [PATCH 6/9] ASoC: sun8i-codec: Fix field bit number indentation Samuel Holland
2020-08-31 3:48 ` [PATCH 7/9] ASoC: sun8i-codec: Sort masks in a consistent order Samuel Holland
2020-08-31 3:48 ` Samuel Holland [this message]
2020-09-04 9:17 ` [PATCH 8/9] ASoC: sun8i-codec: Attach the bus clock to the regmap Maxime Ripard
2020-08-31 3:48 ` [PATCH 9/9] ASoC: sun8i-codec: Manage module clock via DAPM Samuel Holland
2020-09-04 9:17 ` Maxime Ripard
2020-09-07 18:05 ` [PATCH 0/9] ASoC: sun8i-codec driver cleanup 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=20200831034852.18841-9-samuel@sholland.org \
--to=samuel@sholland.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=megous@megous.com \
--cc=mripard@kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=wens@csie.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).