moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: lpass: use the clock provider API

Browse Source 
Clock providers should be registered using the clk_hw API.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20210421120512.413057-5-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jerome Brunet
2021-04-21 14:05:11 +02:00
committed by Mark Brown
parent 8691743c51
commit 27dc72b44e
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/codecs/lpass-va-macro.c
View File

@@ -1343,7 +1343,7 @@ static int va_macro_register_fsgen_output(struct va_macro *va)
if (ret) if (ret)
return ret; return ret;
return of_clk_add_provider(np, of_clk_src_simple_get, va->hw.clk); return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, &va->hw);
} }
static int va_macro_validate_dmic_sample_rate(u32 dmic_sample_rate, static int va_macro_validate_dmic_sample_rate(u32 dmic_sample_rate,
@@ -1452,12 +1452,10 @@ static int va_macro_probe(struct platform_device *pdev)
va_macro_dais, va_macro_dais,
ARRAY_SIZE(va_macro_dais)); ARRAY_SIZE(va_macro_dais));
if (ret) if (ret)
goto soc_err; goto err;
return ret; return ret;
soc_err:
of_clk_del_provider(pdev->dev.of_node);
err: err:
clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks); clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks);
@@ -1468,7 +1466,6 @@ static int va_macro_remove(struct platform_device *pdev)
{ {
struct va_macro *va = dev_get_drvdata(&pdev->dev); struct va_macro *va = dev_get_drvdata(&pdev->dev);
of_clk_del_provider(pdev->dev.of_node);
clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks); clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks);
return 0; return 0;

11
sound/soc/codecs/lpass-wsa-macro.c
View File

@@ -2337,10 +2337,9 @@ static const struct clk_ops swclk_gate_ops = {
.recalc_rate = swclk_recalc_rate, .recalc_rate = swclk_recalc_rate,
}; };
static struct clk *wsa_macro_register_mclk_output(struct wsa_macro *wsa) static int wsa_macro_register_mclk_output(struct wsa_macro *wsa)
{ {
struct device *dev = wsa->dev; struct device *dev = wsa->dev;
struct device_node *np = dev->of_node;
const char *parent_clk_name; const char *parent_clk_name;
const char *clk_name = "mclk"; const char *clk_name = "mclk";
struct clk_hw *hw; struct clk_hw *hw;
@@ -2358,11 +2357,9 @@ static struct clk *wsa_macro_register_mclk_output(struct wsa_macro *wsa)
hw = &wsa->hw; hw = &wsa->hw;
ret = clk_hw_register(wsa->dev, hw); ret = clk_hw_register(wsa->dev, hw);
if (ret) if (ret)
return ERR_PTR(ret); return ret;
of_clk_add_provider(np, of_clk_src_simple_get, hw->clk); return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw);
return NULL;
} }
static const struct snd_soc_component_driver wsa_macro_component_drv = { static const struct snd_soc_component_driver wsa_macro_component_drv = {
@@ -2438,8 +2435,6 @@ static int wsa_macro_remove(struct platform_device *pdev)
{ {
struct wsa_macro *wsa = dev_get_drvdata(&pdev->dev); struct wsa_macro *wsa = dev_get_drvdata(&pdev->dev);
of_clk_del_provider(pdev->dev.of_node);
clk_bulk_disable_unprepare(WSA_NUM_CLKS_MAX, wsa->clks); clk_bulk_disable_unprepare(WSA_NUM_CLKS_MAX, wsa->clks);
return 0; return 0;