Commit 6a16d1a5 authored by Rohit Agarwal's avatar Rohit Agarwal Committed by Linus Walleij
Browse files

pinctrl: qcom: Refactor generic qcom pinctrl driver 



Reuse the generic pingroup struct from pinctrl.h in msm_pingroup
along with the macro defined.

Signed-off-by: default avatarRohit Agarwal <quic_rohiagar@quicinc.com>
Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/1684133170-18540-3-git-send-email-quic_rohiagar@quicinc.com


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

drivers/pinctrl/qcom/pinctrl-apq8064.c

+6 −6
Original line number Diff line number Diff line
@@ -210,9 +210,9 @@ static const unsigned int sdc3_data_pins[] = { 95 }; 


#define PINGROUP(id, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10) \

	{						\

		.name = "gpio" #id,			\

		.pins = gpio##id##_pins,		\

		.npins = ARRAY_SIZE(gpio##id##_pins),	\

		.grp = PINCTRL_PINGROUP("gpio" #id, 	\

			gpio##id##_pins, 		\

			ARRAY_SIZE(gpio##id##_pins)),	\

		.funcs = (int[]){			\

			APQ_MUX_gpio,			\

			APQ_MUX_##f1,			\
@@ -251,9 +251,9 @@ static const unsigned int sdc3_data_pins[] = { 95 }; 


#define SDC_PINGROUP(pg_name, ctl, pull, drv)		\

	{						\

		.name = #pg_name,			\

		.pins = pg_name##_pins,			\

		.npins = ARRAY_SIZE(pg_name##_pins),	\

		.grp = PINCTRL_PINGROUP(#pg_name, 	\

			pg_name##_pins, 		\

			ARRAY_SIZE(pg_name##_pins)),	\

		.ctl_reg = ctl,				\

		.io_reg = 0,				\

		.intr_cfg_reg = 0,			\

drivers/pinctrl/qcom/pinctrl-apq8084.c

+6 −6
Original line number Diff line number Diff line
@@ -325,9 +325,9 @@ static const unsigned int sdc2_data_pins[] = { 152 }; 


#define PINGROUP(id, f1, f2, f3, f4, f5, f6, f7)        \

	{						\

		.name = "gpio" #id,			\

		.pins = gpio##id##_pins,		\

		.npins = ARRAY_SIZE(gpio##id##_pins),	\

		.grp = PINCTRL_PINGROUP("gpio" #id, 	\

			gpio##id##_pins, 		\

			ARRAY_SIZE(gpio##id##_pins)),	\

		.funcs = (int[]){			\

			APQ_MUX_gpio,			\

			APQ_MUX_##f1,			\
@@ -363,9 +363,9 @@ static const unsigned int sdc2_data_pins[] = { 152 }; 


#define SDC_PINGROUP(pg_name, ctl, pull, drv)		\

	{						\

		.name = #pg_name,	                \

		.pins = pg_name##_pins,                 \

		.npins = ARRAY_SIZE(pg_name##_pins),    \

		.grp = PINCTRL_PINGROUP(#pg_name, 	\

			pg_name##_pins, 		\

			ARRAY_SIZE(pg_name##_pins)),	\

		.ctl_reg = ctl,                         \

		.io_reg = 0,                            \

		.intr_cfg_reg = 0,                      \

drivers/pinctrl/qcom/pinctrl-ipq4019.c

+3 −3
Original line number Diff line number Diff line
@@ -217,9 +217,9 @@ DECLARE_QCA_GPIO_PINS(99); 


#define PINGROUP(id, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13, f14) \

	{					        \

		.name = "gpio" #id,			\

		.pins = gpio##id##_pins,		\

		.npins = (unsigned)ARRAY_SIZE(gpio##id##_pins),	\

		.grp = PINCTRL_PINGROUP("gpio" #id, 	\

			gpio##id##_pins, 		\

			ARRAY_SIZE(gpio##id##_pins)),	\

		.funcs = (int[]){			\

			qca_mux_gpio, /* gpio mode */	\

			qca_mux_##f1,			\

drivers/pinctrl/qcom/pinctrl-ipq5332.c

+3 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
#define REG_SIZE 0x1000

#define PINGROUP(id, f1, f2, f3, f4, f5, f6, f7, f8, f9)	\

	{					        \

		.name = "gpio" #id,			\

		.pins = gpio##id##_pins,		\

		.npins = (unsigned int)ARRAY_SIZE(gpio##id##_pins),	\

		.grp = PINCTRL_PINGROUP("gpio" #id, 	\

			gpio##id##_pins, 		\

			ARRAY_SIZE(gpio##id##_pins)),	\

		.funcs = (int[]){			\

			msm_mux_gpio, /* gpio mode */	\

			msm_mux_##f1,			\

drivers/pinctrl/qcom/pinctrl-ipq6018.c

+3 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
#define REG_SIZE 0x1000

#define PINGROUP(id, f1, f2, f3, f4, f5, f6, f7, f8, f9)	\

	{					        \

		.name = "gpio" #id,			\

		.pins = gpio##id##_pins,		\

		.npins = (unsigned int)ARRAY_SIZE(gpio##id##_pins),	\

		.grp = PINCTRL_PINGROUP("gpio" #id, 	\

			gpio##id##_pins, 		\

			ARRAY_SIZE(gpio##id##_pins)),	\

		.funcs = (int[]){			\

			msm_mux_gpio, /* gpio mode */	\

			msm_mux_##f1,			\