Unverified Commit 27dc72b4 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown
Browse files

ASoC: lpass: use the clock provider API 



Clock providers should be registered using the clk_hw API.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Link: https://lore.kernel.org/r/20210421120512.413057-5-jbrunet@baylibre.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8691743c

sound/soc/codecs/lpass-va-macro.c

+2 −5
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ static int va_macro_register_fsgen_output(struct va_macro *va) 
	if (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,
@@ -1452,12 +1452,10 @@ static int va_macro_probe(struct platform_device *pdev) 
					      va_macro_dais,

					      ARRAY_SIZE(va_macro_dais));

	if (ret)

		goto soc_err;

		goto err;



	return ret;



soc_err:

	of_clk_del_provider(pdev->dev.of_node);

err:

	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);



	of_clk_del_provider(pdev->dev.of_node);

	clk_bulk_disable_unprepare(VA_NUM_CLKS_MAX, va->clks);



	return 0;

sound/soc/codecs/lpass-wsa-macro.c

+3 −8
Original line number Diff line number Diff line
@@ -2337,10 +2337,9 @@ static const struct clk_ops swclk_gate_ops = { 
	.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_node *np = dev->of_node;

	const char *parent_clk_name;

	const char *clk_name = "mclk";

	struct clk_hw *hw;
@@ -2358,11 +2357,9 @@ static struct clk *wsa_macro_register_mclk_output(struct wsa_macro *wsa) 
	hw = &wsa->hw;

	ret = clk_hw_register(wsa->dev, hw);

	if (ret)

		return ERR_PTR(ret);



	of_clk_add_provider(np, of_clk_src_simple_get, hw->clk);

		return ret;



	return NULL;

	return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, hw);

}



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);



	of_clk_del_provider(pdev->dev.of_node);



	clk_bulk_disable_unprepare(WSA_NUM_CLKS_MAX, wsa->clks);



	return 0;