Commit a82e5378 authored by Douglas Anderson's avatar Douglas Anderson Committed by Linus Walleij
Browse files

pinctrl: qcom: Allow SoCs to specify a GPIO function that's not 0 



There's currently a comment in the code saying function 0 is GPIO.
Instead of hardcoding it, let's add a member where an SoC can specify
it.  No known SoCs use a number other than 0, but this just makes the
code clearer.  NOTE: no SoC code needs to be updated since we can rely
on zero-initialization.

Signed-off-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarMaulik Shah <mkshah@codeaurora.org>
Tested-by: default avatarMaulik Shah <mkshah@codeaurora.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210114191601.v7.1.I3ad184e3423d8e479bc3e86f5b393abb1704a1d1@changeid


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

drivers/pinctrl/qcom/pinctrl-msm.c

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ static int msm_pinmux_request_gpio(struct pinctrl_dev *pctldev, 
	if (!g->nfuncs)

		return 0;



	/* For now assume function 0 is GPIO because it always is */

	return msm_pinmux_set_mux(pctldev, g->funcs[0], offset);

	return msm_pinmux_set_mux(pctldev, g->funcs[pctrl->soc->gpio_func], offset);

}



static const struct pinmux_ops msm_pinmux_ops = {

drivers/pinctrl/qcom/pinctrl-msm.h

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ struct msm_gpio_wakeirq_map { 
 * @wakeirq_dual_edge_errata: If true then GPIOs using the wakeirq_map need

 *                            to be aware that their parent can't handle dual

 *                            edge interrupts.

 * @gpio_func: Which function number is GPIO (usually 0).

 */

struct msm_pinctrl_soc_data {

	const struct pinctrl_pin_desc *pins;
@@ -134,6 +135,7 @@ struct msm_pinctrl_soc_data { 
	const struct msm_gpio_wakeirq_map *wakeirq_map;

	unsigned int nwakeirq_map;

	bool wakeirq_dual_edge_errata;

	unsigned int gpio_func;

};



extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops;