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: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Co-developed-by: Venkata Prasad Potturu <potturu@codeaurora.org>
Signed-off-by: Venkata Prasad Potturu <potturu@codeaurora.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/1635234188-7746-6-git-send-email-srivasam@codeaurora.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
index c2b933343a0e37b055f9f3a64815d0fe44838dba..2bed5cf229be721f12bcdc5c3bd5f383520ac243 100644 (file)
--- a/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@ -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;

diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
index 67424051cddb939915a27600b464e4a91d4ed172..a4c0a155af5654728854fc5e67d73850a0b100c5 100644 (file)
--- a/sound/soc/codecs/lpass-tx-macro.c
+++ b/sound/soc/codecs/lpass-tx-macro.c
@@ -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;

diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index 70f09b48bc2c05b2e25cdb1006ad44a41db6279e..11147e35689b269d4a37fc41101e0d294108e7ed 100644 (file)
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -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;