Commit b51d33ea authored by Til Kaiser's avatar Til Kaiser Committed by Linus Walleij
Browse files

pinctrl: qcom: ipq4019: mark gpio as a GPIO pin function 



The qcom pinctrl core supports marking functions that represent GPIO mode
via PINCTRL_GPIO_PINFUNCTION(), so that strict pinmuxing does not reject
GPIO requests for pins that are muxed to the GPIO function.

ipq4019 still describes its gpio function with QCA_PIN_FUNCTION(gpio),
so it is not treated as a GPIO pin function. As a result, GPIO consumers
can still conflict with pinctrl states that select the "gpio" function.

Add a QCA_GPIO_PIN_FUNCTION() helper and use it for the ipq4019 gpio
function, matching how the msm-based qcom drivers handle this.

This allows ipq4019 to keep the GPIO-related pin configuration in DTS
without tripping over strict pinmux ownership checks.

Fixes: cc85cb96 ("pinctrl: qcom: make the pinmuxing strict")
Signed-off-by: default avatarTil Kaiser <mail@tk154.de>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: default avatarLinus Walleij <linusw@kernel.org>
parent b560d414

drivers/pinctrl/qcom/pinctrl-ipq4019.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static const struct pinfunction ipq4019_functions[] = { 
	QCA_PIN_FUNCTION(blsp_uart0),

	QCA_PIN_FUNCTION(blsp_uart1),

	QCA_PIN_FUNCTION(chip_rst),

	QCA_PIN_FUNCTION(gpio),

	QCA_GPIO_PIN_FUNCTION(gpio),

	QCA_PIN_FUNCTION(i2s_rx),

	QCA_PIN_FUNCTION(i2s_spdif_in),

	QCA_PIN_FUNCTION(i2s_spdif_out),

drivers/pinctrl/qcom/pinctrl-msm.h

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ struct pinctrl_pin_desc; 
					fname##_groups,		\

					ARRAY_SIZE(fname##_groups))



#define QCA_GPIO_PIN_FUNCTION(fname)				\

	[qca_mux_##fname] = PINCTRL_GPIO_PINFUNCTION(#fname,	\

					fname##_groups,		\

					ARRAY_SIZE(fname##_groups))



/**

 * struct msm_pingroup - Qualcomm pingroup definition

 * @grp:                  Generic data of the pin group (name and pins)