GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 08:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: es8316: fix redundant codes of clock

Browse source 
This patch removes redundant null checks for optional MCLK clock.
And fix DT binding document for changing clock property to optional
from required.

Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
Link: https://lore.kernel.org/r/20190907163653.9382-1-katsuhiro@katsuster.net
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Katsuhiro Suzuki 2019-09-08 01:36:52 +09:00 • committed by Mark Brown
parent f4df4e4042
commit 0db0c62c88
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Documentation/devicetree/bindings/sound/everest,es8316.txt
View file

@ -6,6 +6,9 @@ Required properties:
- compatible : should be "everest,es8316" - compatible : should be "everest,es8316"
- reg : the I2C address of the device for I2C - reg : the I2C address of the device for I2C
Optional properties:
- clocks : a list of phandle, should contain entries for clock-names - clocks : a list of phandle, should contain entries for clock-names
- clock-names : should include as follows: - clock-names : should include as follows:
"mclk" : master clock (MCLK) of the device "mclk" : master clock (MCLK) of the device

31
sound/soc/codecs/es8316.c
View file

@ -370,11 +370,9 @@ static int es8316_set_dai_sysclk(struct snd_soc_dai *codec_dai,
if (freq == 0) if (freq == 0)
return 0; return 0;
if (es8316->mclk) { ret = clk_set_rate(es8316->mclk, freq);
ret = clk_set_rate(es8316->mclk, freq); if (ret)
if (ret) return ret;
return ret;
}
/* Limit supported sample rates to ones that can be autodetected /* Limit supported sample rates to ones that can be autodetected
* by the codec running in slave mode. * by the codec running in slave mode.
@ -709,20 +707,18 @@ static int es8316_probe(struct snd_soc_component *component)
es8316->component = component; es8316->component = component;
es8316->mclk = devm_clk_get(component->dev, "mclk"); es8316->mclk = devm_clk_get_optional(component->dev, "mclk");
if (PTR_ERR(es8316->mclk) == -EPROBE_DEFER)
return -EPROBE_DEFER;
if (IS_ERR(es8316->mclk)) { if (IS_ERR(es8316->mclk)) {
dev_err(component->dev, "clock is invalid, ignored\n"); dev_err(component->dev, "unable to get mclk\n");
es8316->mclk = NULL; return PTR_ERR(es8316->mclk);
} }
if (!es8316->mclk)
dev_warn(component->dev, "assuming static mclk\n");
if (es8316->mclk) { ret = clk_prepare_enable(es8316->mclk);
ret = clk_prepare_enable(es8316->mclk); if (ret) {
if (ret) { dev_err(component->dev, "unable to enable mclk\n");
dev_err(component->dev, "unable to enable clock\n"); return ret;
return ret;
}
} }
/* Reset codec and enable current state machine */ /* Reset codec and enable current state machine */
@ -751,8 +747,7 @@ static void es8316_remove(struct snd_soc_component *component)
{ {
struct es8316_priv *es8316 = snd_soc_component_get_drvdata(component); struct es8316_priv *es8316 = snd_soc_component_get_drvdata(component);
if (es8316->mclk) clk_disable_unprepare(es8316->mclk);
clk_disable_unprepare(es8316->mclk);
} }
static const struct snd_soc_component_driver soc_component_dev_es8316 = { static const struct snd_soc_component_driver soc_component_dev_es8316 = {