iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: sun8i-codec: Manage module clock via DAPM

Browse Source 
By representing the module clock as a DAPM widget, we ensure that the
clock is only enabled when the module is actually in use, without
additional code in runtime PM hooks.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20200831034852.18841-10-samuel@sholland.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Samuel Holland 2020-08-30 22:48:52 -05:00 committed by Mark Brown
parent efb736fb9e
commit 6b3bb3c82b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/soc/sunxi/sun8i-codec.c
View File

@ -102,26 +102,15 @@ static int sun8i_codec_runtime_resume(struct device *dev)
struct sun8i_codec *scodec = dev_get_drvdata(dev); struct sun8i_codec *scodec = dev_get_drvdata(dev);
int ret; int ret;
ret = clk_prepare_enable(scodec->clk_module);
if (ret) {
dev_err(dev, "Failed to enable the module clock\n");
return ret;
}
regcache_cache_only(scodec->regmap, false); regcache_cache_only(scodec->regmap, false);
ret = regcache_sync(scodec->regmap); ret = regcache_sync(scodec->regmap);
if (ret) { if (ret) {
dev_err(dev, "Failed to sync regmap cache\n"); dev_err(dev, "Failed to sync regmap cache\n");
goto err_disable_clk; return ret;
} }
return 0; return 0;
err_disable_clk:
clk_disable_unprepare(scodec->clk_module);
return ret;
} }
static int sun8i_codec_runtime_suspend(struct device *dev) static int sun8i_codec_runtime_suspend(struct device *dev)
@ -131,8 +120,6 @@ static int sun8i_codec_runtime_suspend(struct device *dev)
regcache_cache_only(scodec->regmap, true); regcache_cache_only(scodec->regmap, true);
regcache_mark_dirty(scodec->regmap); regcache_mark_dirty(scodec->regmap);
clk_disable_unprepare(scodec->clk_module);
return 0; return 0;
} }
@ -379,6 +366,8 @@ static const struct snd_kcontrol_new sun8i_input_mixer_controls[] = {
}; };
static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
SND_SOC_DAPM_CLOCK_SUPPLY("mod"),
/* Digital parts of the DACs and ADC */ /* Digital parts of the DACs and ADC */
SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA,
0, NULL, 0), 0, NULL, 0),
@ -448,6 +437,8 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
/* Clock Routes */ /* Clock Routes */
{ "AIF1", NULL, "mod" },
{ "AIF1", NULL, "SYSCLK AIF1" }, { "AIF1", NULL, "SYSCLK AIF1" },
{ "AIF1 PLL", NULL, "AIF1" }, { "AIF1 PLL", NULL, "AIF1" },
{ "SYSCLK", NULL, "AIF1 PLL" }, { "SYSCLK", NULL, "AIF1 PLL" },