diff mbox series

pinctrl: qcom: sc7280: Fix compile bug

Message ID 20220627092425.98730-1-linus.walleij@linaro.org
State New
Headers show
Series pinctrl: qcom: sc7280: Fix compile bug | expand

Commit Message

Linus Walleij June 27, 2022, 9:24 a.m. UTC
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(-)

Comments

Srinivasa Rao Mandadapu June 27, 2022, 9:30 a.m. UTC | #1
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";
Linus Walleij June 28, 2022, 2:09 p.m. UTC | #2
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
diff mbox series

Patch

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