Unverified Commit 9f589cf0 authored by Srinivasa Rao Mandadapu's avatar Srinivasa Rao Mandadapu Committed by Mark Brown
Browse files

ASoC: codecs: Change bulk clock voting to optional voting in digital codecs 



Change bulk clock frequency voting to optional bulk voting in va, rx and tx macros
to accommodate both ADSP and ADSP bypass based lpass architectures.

Signed-off-by: default avatarSrinivasa Rao Mandadapu <srivasam@codeaurora.org>
Co-developed-by: default avatarVenkata Prasad Potturu <potturu@codeaurora.org>
Signed-off-by: default avatarVenkata Prasad Potturu <potturu@codeaurora.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/1635234188-7746-6-git-send-email-srivasam@codeaurora.org


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

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

+1 −1
Original line number Diff line number Diff line
@@ -3531,7 +3531,7 @@ static int rx_macro_probe(struct platform_device *pdev) 
	rx->clks[3].id = "npl";

	rx->clks[4].id = "fsgen";



	ret = devm_clk_bulk_get(dev, RX_NUM_CLKS_MAX, rx->clks);

	ret = devm_clk_bulk_get_optional(dev, RX_NUM_CLKS_MAX, rx->clks);

	if (ret) {

		dev_err(dev, "Error getting RX Clocks (%d)\n", ret);

		return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -1796,7 +1796,7 @@ static int tx_macro_probe(struct platform_device *pdev) 
	tx->clks[3].id = "npl";

	tx->clks[4].id = "fsgen";



	ret = devm_clk_bulk_get(dev, TX_NUM_CLKS_MAX, tx->clks);

	ret = devm_clk_bulk_get_optional(dev, TX_NUM_CLKS_MAX, tx->clks);

	if (ret) {

		dev_err(dev, "Error getting RX Clocks (%d)\n", ret);

		return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static int va_macro_probe(struct platform_device *pdev) 
	va->clks[1].id = "dcodec";

	va->clks[2].id = "mclk";



	ret = devm_clk_bulk_get(dev, VA_NUM_CLKS_MAX, va->clks);

	ret = devm_clk_bulk_get_optional(dev, VA_NUM_CLKS_MAX, va->clks);

	if (ret) {

		dev_err(dev, "Error getting VA Clocks (%d)\n", ret);

		return ret;