From: Stephen Boyd Date: Mon, 1 Oct 2018 21:49:05 +0000 (-0700) Subject: pinctrl: msm: Actually use function 0 for gpio selection X-Git-Tag: v5.4-rc1~2434^2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de0c18a87cfa094cb23655624859e09da5146e2a;p=platform%2Fkernel%2Flinux-rpi.git pinctrl: msm: Actually use function 0 for gpio selection This code needs to select function #0, which is the first int in the array of functions, not the number 0 which may or may not be the function for "GPIO mode" per the enum mapping. We were getting lucky on SDM845, where this was tested, because the function 0 matched the enum value for "GPIO mode". On other platforms, e.g. MSM8996, the gpio enum value is the last one in the list so this code doesn't work and we see a warning at boot. Fix it by grabbing the first element out of the array of functions. Cc: Doug Anderson Cc: Bjorn Andersson Cc: Niklas Cassel Reported-by: Niklas Cassel Fixes: 1de7ddb3a15c ("pinctrl: msm: Mux out gpio function with gpio_request()") Signed-off-by: Stephen Boyd Reviewed-by: Bjorn Andersson Tested-by: Niklas Cassel Signed-off-by: Linus Walleij --- diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 0726c8a..d12bed7 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -207,7 +207,7 @@ static int msm_pinmux_request_gpio(struct pinctrl_dev *pctldev, return 0; /* For now assume function 0 is GPIO because it always is */ - return msm_pinmux_set_mux(pctldev, 0, offset); + return msm_pinmux_set_mux(pctldev, g->funcs[0], offset); } static const struct pinmux_ops msm_pinmux_ops = {