pinctrl: qcom: glymur: Fix the gpio and egpio pin functions

[ Upstream commit e73fda2dcb0bad6650e654556c5242b773707257 ]

Mark the gpio/egpio as GPIO specific pin functions, othewise
the pin muxing generic framework will complain about the gpio
being already requested by a different owner.

Fixes: 87ebcd8baebf ("pinctrl: qcom: Add glymur pinctrl driver")
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/pinctrl/qcom/pinctrl-glymur.c b/drivers/pinctrl/qcom/pinctrl-glymur.c
index 9781e7fcb3a11c85dbd5497170188e2da051215b..335005084b6bc87db6d700471264edde00370ca0 100644 (file)
--- a/drivers/pinctrl/qcom/pinctrl-glymur.c
+++ b/drivers/pinctrl/qcom/pinctrl-glymur.c
@@ -1316,7 +1316,7 @@ static const char *const wcn_sw_ctrl_groups[] = {
 };
 
 static const struct pinfunction glymur_functions[] = {
-       MSM_PIN_FUNCTION(gpio),
+       MSM_GPIO_PIN_FUNCTION(gpio),
        MSM_PIN_FUNCTION(resout_gpio_n),
        MSM_PIN_FUNCTION(aoss_cti),
        MSM_PIN_FUNCTION(asc_cci),
@@ -1342,7 +1342,7 @@ static const struct pinfunction glymur_functions[] = {
        MSM_PIN_FUNCTION(edp0_hot),
        MSM_PIN_FUNCTION(edp0_lcd),
        MSM_PIN_FUNCTION(edp1_lcd),
-       MSM_PIN_FUNCTION(egpio),
+       MSM_GPIO_PIN_FUNCTION(egpio),
        MSM_PIN_FUNCTION(eusb_ac_en),
        MSM_PIN_FUNCTION(gcc_gp1),
        MSM_PIN_FUNCTION(gcc_gp2),