pinctrl: qcom: Update clock voting as optional

Update bulk clock voting to optional voting as ADSP bypass platform doesn't
need macro and decodec clocks, as these macro and dcodec GDSC switches are
maintained as power domains and operated from lpass clock drivers.

Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Co-developed-by: Venkata Prasad Potturu <quic_potturu@quicinc.com>
Signed-off-by: Venkata Prasad Potturu <quic_potturu@quicinc.com>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/1650285427-19752-8-git-send-email-quic_srivasam@quicinc.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
index 717e937549494305111f595114ee6c12e4fc0e39..74810ec4df4478eb9a80dba79da34ecaad06c5c8 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
+++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
@@ -401,9 +401,13 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
                return dev_err_probe(dev, PTR_ERR(pctrl->slew_base),
                                     "Slew resource not provided\n");
 
-       ret = devm_clk_bulk_get(dev, MAX_LPI_NUM_CLKS, pctrl->clks);
+       if (data->is_clk_optional)
+               ret = devm_clk_bulk_get_optional(dev, MAX_LPI_NUM_CLKS, pctrl->clks);
+       else
+               ret = devm_clk_bulk_get(dev, MAX_LPI_NUM_CLKS, pctrl->clks);
+
        if (ret)
-               return dev_err_probe(dev, ret, "Can't get clocks\n");
+               return ret;
 
        ret = clk_bulk_prepare_enable(MAX_LPI_NUM_CLKS, pctrl->clks);
        if (ret)

diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
index afbac2a6c82ca33e68434bc656a6938dc4a80a7b..759d5d8da562ae197ec0599b3ed50352e4e9fc4c 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
+++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
@@ -77,6 +77,7 @@ struct lpi_pinctrl_variant_data {
        int ngroups;
        const struct lpi_function *functions;
        int nfunctions;
+       bool is_clk_optional;
 };
 
 int lpi_pinctrl_probe(struct platform_device *pdev);

diff --git a/drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c
index d615b6c55b89197dbad45ce8d4bc319142cfe7e4..2add9a4520c254153e7ef27544db0c63715dd767 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c
+++ b/drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c
@@ -141,6 +141,7 @@ static const struct lpi_pinctrl_variant_data sc7280_lpi_data = {
        .ngroups = ARRAY_SIZE(sc7280_groups),
        .functions = sc7280_functions,
        .nfunctions = ARRAY_SIZE(sc7280_functions),
+       .is_clk_optional = true,
 };
 
 static const struct of_device_id lpi_pinctrl_of_match[] = {