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

ASoC: Intel: bytcr_rt5640: use devm_clk_get_optional() for mclk

Browse Source 
The devm_clk_get_optional() helper returns NULL when devm_clk_get()
returns -ENOENT. This makes things slightly cleaner. The added benefit
is mostly cosmetic.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211007165715.27463-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2021-10-07 19:57:14 +03:00 committed by Mark Brown
parent 81d43ca175
commit a15ca6e3b8
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 32 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
sound/soc/intel/boards/bytcr_rt5640.c
View File

@ -269,13 +269,10 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
return -EIO; return -EIO;
if (SND_SOC_DAPM_EVENT_ON(event)) { if (SND_SOC_DAPM_EVENT_ON(event)) {
if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) { ret = clk_prepare_enable(priv->mclk);
ret = clk_prepare_enable(priv->mclk); if (ret < 0) {
if (ret < 0) { dev_err(card->dev, "could not configure MCLK state\n");
dev_err(card->dev, return ret;
"could not configure MCLK state\n");
return ret;
}
} }
ret = byt_rt5640_prepare_and_enable_pll1(codec_dai, 48000); ret = byt_rt5640_prepare_and_enable_pll1(codec_dai, 48000);
} else { } else {
@ -287,10 +284,8 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_RCCLK, ret = snd_soc_dai_set_sysclk(codec_dai, RT5640_SCLK_S_RCCLK,
48000 * 512, 48000 * 512,
SND_SOC_CLOCK_IN); SND_SOC_CLOCK_IN);
if (!ret) { if (!ret)
if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) clk_disable_unprepare(priv->mclk);
clk_disable_unprepare(priv->mclk);
}
} }
if (ret < 0) { if (ret < 0) {
@ -1217,30 +1212,25 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)
return ret; return ret;
} }
if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) { /*
/* * The firmware might enable the clock at boot (this information
* The firmware might enable the clock at * may or may not be reflected in the enable clock register).
* boot (this information may or may not * To change the rate we must disable the clock first to cover
* be reflected in the enable clock register). * these cases. Due to common clock framework restrictions that
* To change the rate we must disable the clock * do not allow to disable a clock that has not been enabled,
* first to cover these cases. Due to common * we need to enable the clock first.
* clock framework restrictions that do not allow */
* to disable a clock that has not been enabled, ret = clk_prepare_enable(priv->mclk);
* we need to enable the clock first. if (!ret)
*/ clk_disable_unprepare(priv->mclk);
ret = clk_prepare_enable(priv->mclk);
if (!ret)
clk_disable_unprepare(priv->mclk);
if (byt_rt5640_quirk & BYT_RT5640_MCLK_25MHZ) if (byt_rt5640_quirk & BYT_RT5640_MCLK_25MHZ)
ret = clk_set_rate(priv->mclk, 25000000); ret = clk_set_rate(priv->mclk, 25000000);
else else
ret = clk_set_rate(priv->mclk, 19200000); ret = clk_set_rate(priv->mclk, 19200000);
if (ret) {
if (ret) { dev_err(card->dev, "unable to set MCLK rate\n");
dev_err(card->dev, "unable to set MCLK rate\n"); return ret;
return ret;
}
} }
if (BYT_RT5640_JDSRC(byt_rt5640_quirk)) { if (BYT_RT5640_JDSRC(byt_rt5640_quirk)) {
@ -1653,7 +1643,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
byt_rt5640_dais[dai_index].cpus->dai_name = "ssp0-port"; byt_rt5640_dais[dai_index].cpus->dai_name = "ssp0-port";
if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) { if (byt_rt5640_quirk & BYT_RT5640_MCLK_EN) {
priv->mclk = devm_clk_get(dev, "pmc_plt_clk_3"); priv->mclk = devm_clk_get_optional(dev, "pmc_plt_clk_3");
if (IS_ERR(priv->mclk)) { if (IS_ERR(priv->mclk)) {
ret_val = PTR_ERR(priv->mclk); ret_val = PTR_ERR(priv->mclk);
@ -1661,15 +1651,14 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev)
"Failed to get MCLK from pmc_plt_clk_3: %d\n", "Failed to get MCLK from pmc_plt_clk_3: %d\n",
ret_val); ret_val);
/* goto err;
* Fall back to bit clock usage for -ENOENT (clock not
* available likely due to missing dependencies), bail
* for all other errors, including -EPROBE_DEFER
*/
if (ret_val != -ENOENT)
goto err;
byt_rt5640_quirk &= ~BYT_RT5640_MCLK_EN;
} }
/*
* Fall back to bit clock usage when clock is not
* available likely due to missing dependencies.
*/
if (!priv->mclk)
byt_rt5640_quirk &= ~BYT_RT5640_MCLK_EN;
} }
if (byt_rt5640_quirk & BYT_RT5640_NO_SPEAKERS) { if (byt_rt5640_quirk & BYT_RT5640_NO_SPEAKERS) {