[PATCH] pinctrl: qcom: sc7280: Fix compile bug

[PATCH] pinctrl: qcom: sc7280: Fix compile bug

[Linus Walleij]

The idea was right but the code was breaking in next.
I assume some unstaged commit was involed. Fix it up.

Cc: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Cc: Stephen Boyd <swboyd@chromium.org>
Fixes: 36fe26843d6d ("pinctrl: qcom: sc7280: Add clock optional check for ADSP bypass targets")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
index b3d4244a5266..b5d1b996c454 100644
--- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
+++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
@@ -388,7 +388,8 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
 	pctrl->data = data;
 	pctrl->dev = &pdev->dev;
 
-	data->is_clk_optional = of_property_read_bool(np, "qcom,adsp-bypass-mode");
+	data->is_clk_optional = of_property_read_bool(dev->of_node,
+						      "qcom,adsp-bypass-mode");
 
 	pctrl->clks[0].id = "core";
 	pctrl->clks[1].id = "audio";
-- 
2.36.1

Re: [PATCH] pinctrl: qcom: sc7280: Fix compile bug

[Srinivasa Rao Mandadapu]

On 6/27/2022 2:54 PM, Linus Walleij wrote:
Thanks for Your Support Linus.
> The idea was right but the code was breaking in next.
> I assume some unstaged commit was involed. Fix it up.
>
> Cc: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
> Cc: Stephen Boyd <swboyd@chromium.org>
> Fixes: 36fe26843d6d ("pinctrl: qcom: sc7280: Add clock optional check for ADSP bypass targets")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>   drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
> index b3d4244a5266..b5d1b996c454 100644
> --- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
> +++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
> @@ -388,7 +388,8 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
>   	pctrl->data = data;
>   	pctrl->dev = &pdev->dev;
>   
> -	data->is_clk_optional = of_property_read_bool(np, "qcom,adsp-bypass-mode");
> +	data->is_clk_optional = of_property_read_bool(dev->of_node,
> +						      "qcom,adsp-bypass-mode");

There is another problem with this patch.  As lpi_pinctrl_variant_data 
is const type,  unable to update this variable.

So I have posted the fix patch series v5. Please check and let me me if 
anything to be done.

>   
>   	pctrl->clks[0].id = "core";
>   	pctrl->clks[1].id = "audio";

Re: [PATCH] pinctrl: qcom: sc7280: Fix compile bug

[Linus Walleij]

On Mon, Jun 27, 2022 at 11:30 AM Srinivasa Rao Mandadapu
<quic_srivasam@quicinc.com> wrote:
> On 6/27/2022 2:54 PM, Linus Walleij wrote:
> Thanks for Your Support Linus.

> > The idea was right but the code was breaking in next.
> > I assume some unstaged commit was involed. Fix it up.
> >
> > Cc: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
> > Cc: Stephen Boyd <swboyd@chromium.org>
> > Fixes: 36fe26843d6d ("pinctrl: qcom: sc7280: Add clock optional check for ADSP bypass targets")
> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
(...)

> There is another problem with this patch.  As lpi_pinctrl_variant_data
> is const type,  unable to update this variable.

Ooops

> So I have posted the fix patch series v5. Please check and let me me if
> anything to be done.

I have already pulled other changes on top so I would have to revert
the patches, can you inspect what is on my "devel" branch and
just send a fixup patch on top?

Yours,
Linus Walleij

Re: [PATCH] pinctrl: qcom: sc7280: Fix compile bug

[Stephen Boyd]

Quoting Srinivasa Rao Mandadapu (2022-06-28 23:34:45)
> Fix the compilation error, caused by updtating constant variable.

s/updtating/updating/

> Hence remove redundant constant variable, which is no more useful
> as per new design.
>
> The issue is due to some unstaged changes. Fix it up.
>
> Fixes: 36fe26843d6d ("pinctrl: qcom: sc7280: Add clock optional check for ADSP bypass targets")
>
> Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
> ---

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

[PATCH] pinctrl: qcom: sc7280: Fix compile bug

[Srinivasa Rao Mandadapu]

Fix the compilation error, caused by updtating constant variable.
Hence remove redundant constant variable, which is no more useful
as per new design.

The issue is due to some unstaged changes. Fix it up.

Fixes: 36fe26843d6d ("pinctrl: qcom: sc7280: Add clock optional check for ADSP bypass targets")

Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
---
 drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 5 +----
 drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
index b5d1b99..e97ce45 100644
--- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
+++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c
@@ -388,9 +388,6 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
 	pctrl->data = data;
 	pctrl->dev = &pdev->dev;
 
-	data->is_clk_optional = of_property_read_bool(dev->of_node,
-						      "qcom,adsp-bypass-mode");
-
 	pctrl->clks[0].id = "core";
 	pctrl->clks[1].id = "audio";
 
@@ -404,7 +401,7 @@ int lpi_pinctrl_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, PTR_ERR(pctrl->slew_base),
 				     "Slew resource not provided\n");
 
-	if (data->is_clk_optional)
+	if (of_property_read_bool(dev->of_node, "qcom,adsp-bypass-mode"))
 		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);
diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
index 759d5d8..afbac2a 100644
--- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
+++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.h
@@ -77,7 +77,6 @@ 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);
-- 
2.7.4