Commit bb2c2fe7 authored by Srinivasa Rao Mandadapu's avatar Srinivasa Rao Mandadapu Committed by Linus Walleij
Browse files

pinctrl: qcom: sc7280: Fix compile bug 



Fix the compilation error, caused by updating 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: 36fe2684 ("pinctrl: qcom: sc7280: Add clock optional check for ADSP bypass targets")

Signed-off-by: default avatarSrinivasa Rao Mandadapu <quic_srivasam@quicinc.com>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/1656489290-20881-1-git-send-email-quic_srivasam@quicinc.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b1f35971

drivers/pinctrl/qcom/pinctrl-lpass-lpi.c

+1 −4
Original line number Diff line number Diff line
@@ -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);

drivers/pinctrl/qcom/pinctrl-lpass-lpi.h

+0 −1
Original line number Diff line number Diff line
@@ -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);