pinctrl: alderlake: Deduplicate COMMUNITY macro code
Subsystems (3)
PATCH 1/5 pinctrl: alderlake: Deduplicate COMMUNITY macro code
Define a common COMUNITY macro and supply a variant to it. This removes some verbosity in macros.
--- drivers/pinctrl/intel/pinctrl-alderlake.c | 40 +++++++++-------------- 1 file changed, 16 insertions(+), 24 deletions(-)
drivers/pinctrl/intel/pinctrl-alderlake.c +16 -24
@@ -34,33 +34,25 @@ .gpio_base = (g), \ } -#define ADL_N_COMMUNITY (b, s, e, g) \ - { \ - .barno = (b), \ - .padown_offset = ADL_N_PAD_OWN, \ - .padcfglock_offset = ADL_N_PADCFGLOCK, \ - .hostown_offset = ADL_N_HOSTSW_OWN, \ - .is_offset = ADL_N_GPI_IS, \ - .ie_offset = ADL_N_GPI_IE, \ - .pin_base = (s), \ - .npins = ((e) - (s) + 1), \ - .gpps = (g), \ - .ngpps = ARRAY_SIZE(g), \ +#define ADL_COMMUNITY (b, s, e, g, v) \ + { \ + .barno = (b), \ + .padown_offset = ADL_##v##_PAD_OWN, \ + .padcfglock_offset = ADL_##v##_PADCFGLOCK, \ + .hostown_offset = ADL_##v##_HOSTSW_OWN, \ + .is_offset = ADL_##v##_GPI_IS, \ + .ie_offset = ADL_##v##_GPI_IE, \ + .pin_base = (s), \ + .npins = ((e) - (s) + 1), \ + .gpps = (g), \ + .ngpps = ARRAY_SIZE(g), \ } +#define ADL_N_COMMUNITY (b, s, e, g) \ + ADL_COMMUNITY(b, s, e, g, N) +#define ADL_S_COMMUNITY (b, s, e, g) \ - { \ - .barno = (b), \ - .padown_offset = ADL_S_PAD_OWN, \ - .padcfglock_offset = ADL_S_PADCFGLOCK, \ - .hostown_offset = ADL_S_HOSTSW_OWN, \ - .is_offset = ADL_S_GPI_IS, \ - .ie_offset = ADL_S_GPI_IE, \ - .pin_base = (s), \ - .npins = ((e) - (s) + 1), \ - .gpps = (g), \ - .ngpps = ARRAY_SIZE(g), \ - } + ADL_COMMUNITY(b, s, e, g, S)/* Alder Lake-N */ static const struct pinctrl_pin_desc adln_pins[] = {
Signature · 1 line
2.35.1
PATCH 2/5 pinctrl: cannonlake: Deduplicate COMMUNITY macro code
Define a common COMUNITY macro and supply a variant to it. This removes some verbosity in macros.
--- drivers/pinctrl/intel/pinctrl-cannonlake.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/intel/pinctrl-cannonlake.c +4 -4
@@ -30,12 +30,12 @@ .gpio_base = (g), \ } -#define CNL_COMMUNITY (b, s, e, ho, g) \ +#define CNL_COMMUNITY (b, s, e, g, v) \ { \ .barno = (b), \ .padown_offset = CNL_PAD_OWN, \ .padcfglock_offset = CNL_PADCFGLOCK, \ - .hostown_offset = (ho), \ + .hostown_offset = CNL_##v##_HOSTSW_OWN, \ .is_offset = CNL_GPI_IS, \ .ie_offset = CNL_GPI_IE, \ .pin_base = (s), \
@@ -45,10 +45,10 @@ }#define CNL_LP_COMMUNITY (b, s, e, g) \ - CNL_COMMUNITY(b, s, e, CNL_LP_HOSTSW_OWN, g) + CNL_COMMUNITY(b, s, e, g, LP)#define CNL_H_COMMUNITY (b, s, e, g) \ - CNL_COMMUNITY(b, s, e, CNL_H_HOSTSW_OWN, g) + CNL_COMMUNITY(b, s, e, g, H)/* Cannon Lake-H */ static const struct pinctrl_pin_desc cnlh_pins[] = {
Signature · 1 line
2.35.1
PATCH 3/5 pinctrl: icelake: Deduplicate COMMUNITY macro code
In reply to Andy ShevchenkoDefine a common COMUNITY macro and supply a variant to it. This removes some verbosity in macros.
--- drivers/pinctrl/intel/pinctrl-icelake.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pinctrl/intel/pinctrl-icelake.c +4 -4
@@ -30,14 +30,14 @@ .gpio_base = (g), \ } -#define ICL_COMMUNITY (b, s, e, ie, g) \ +#define ICL_COMMUNITY (b, s, e, g, v) \ { \ .barno = (b), \ .padown_offset = ICL_PAD_OWN, \ .padcfglock_offset = ICL_PADCFGLOCK, \ .hostown_offset = ICL_HOSTSW_OWN, \ .is_offset = ICL_GPI_IS, \ - .ie_offset = (ie), \ + .ie_offset = ICL_##v##_GPI_IE, \ .pin_base = (s), \ .npins = ((e) - (s) + 1), \ .gpps = (g), \
@@ -45,10 +45,10 @@ }#define ICL_LP_COMMUNITY (b, s, e, g) \ - ICL_COMMUNITY(b, s, e, ICL_LP_GPI_IE, g) + ICL_COMMUNITY(b, s, e, g, LP)#define ICL_N_COMMUNITY (b, s, e, g) \ - ICL_COMMUNITY(b, s, e, ICL_N_GPI_IE, g) + ICL_COMMUNITY(b, s, e, g, N)/* Ice Lake-LP */ static const struct pinctrl_pin_desc icllp_pins[] = {
Signature · 1 line
2.35.1
PATCH 4/5 pinctrl: sunrisepoint: Deduplicate COMMUNITY macro code
In reply to Andy ShevchenkoDefine a common COMUNITY macro and supply a variant to it. This removes some verbosity in macros.
--- drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/pinctrl/intel/pinctrl-sunrisepoint.c +16 -16
@@ -22,24 +22,24 @@#define SPT_GPI_IS 0x100#define SPT_GPI_IE 0x120 -#define SPT_COMMUNITY (b, s, e, pl, gs, gn, g, n) \ - { \ - .barno = (b), \ - .padown_offset = SPT_PAD_OWN, \ - .padcfglock_offset = (pl), \ - .hostown_offset = SPT_HOSTSW_OWN, \ - .is_offset = SPT_GPI_IS, \ - .ie_offset = SPT_GPI_IE, \ - .gpp_size = (gs), \ - .gpp_num_padown_regs = (gn), \ - .pin_base = (s), \ - .npins = ((e) - (s) + 1), \ - .gpps = (g), \ - .ngpps = (n), \ +#define SPT_COMMUNITY (b, s, e, g, n, v, gs, gn) \ + { \ + .barno = (b), \ + .padown_offset = SPT_PAD_OWN, \ + .padcfglock_offset = SPT_##v##_PADCFGLOCK, \ + .hostown_offset = SPT_HOSTSW_OWN, \ + .is_offset = SPT_GPI_IS, \ + .ie_offset = SPT_GPI_IE, \ + .gpp_size = (gs), \ + .gpp_num_padown_regs = (gn), \ + .pin_base = (s), \ + .npins = ((e) - (s) + 1), \ + .gpps = (g), \ + .ngpps = (n), \ }#define SPT_LP_COMMUNITY (b, s, e) \ - SPT_COMMUNITY(b, s, e, SPT_LP_PADCFGLOCK, 24, 4, NULL, 0) + SPT_COMMUNITY(b, s, e, NULL, 0, LP, 24, 4)#define SPT_H_GPP (r, s, e, g) \ { \
@@ -50,7 +50,7 @@ }#define SPT_H_COMMUNITY (b, s, e, g) \ - SPT_COMMUNITY(b, s, e, SPT_H_PADCFGLOCK, 0, 0, g, ARRAY_SIZE(g)) + SPT_COMMUNITY(b, s, e, g, ARRAY_SIZE(g), H, 0, 0)/* Sunrisepoint-LP */ static const struct pinctrl_pin_desc sptlp_pins[] = {
Signature · 1 line
2.35.1
PATCH 5/5 pinctrl: tigerlake: Deduplicate COMMUNITY macro code
In reply to Andy ShevchenkoDefine a common COMUNITY macro and supply a variant to it. This removes some verbosity in macros.
--- drivers/pinctrl/intel/pinctrl-tigerlake.c | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/pinctrl/intel/pinctrl-tigerlake.c +14 -14
@@ -31,25 +31,25 @@ .gpio_base = (g), \ } -#define TGL_COMMUNITY (b, s, e, pl, ho, g) \ - { \ - .barno = (b), \ - .padown_offset = TGL_PAD_OWN, \ - .padcfglock_offset = (pl), \ - .hostown_offset = (ho), \ - .is_offset = TGL_GPI_IS, \ - .ie_offset = TGL_GPI_IE, \ - .pin_base = (s), \ - .npins = ((e) - (s) + 1), \ - .gpps = (g), \ - .ngpps = ARRAY_SIZE(g), \ +#define TGL_COMMUNITY (b, s, e, g, v) \ + { \ + .barno = (b), \ + .padown_offset = TGL_PAD_OWN, \ + .padcfglock_offset = TGL_##v##_PADCFGLOCK, \ + .hostown_offset = TGL_##v##_HOSTSW_OWN, \ + .is_offset = TGL_GPI_IS, \ + .ie_offset = TGL_GPI_IE, \ + .pin_base = (s), \ + .npins = ((e) - (s) + 1), \ + .gpps = (g), \ + .ngpps = ARRAY_SIZE(g), \ }#define TGL_LP_COMMUNITY (b, s, e, g) \ - TGL_COMMUNITY(b, s, e, TGL_LP_PADCFGLOCK, TGL_LP_HOSTSW_OWN, g) + TGL_COMMUNITY(b, s, e, g, LP)#define TGL_H_COMMUNITY (b, s, e, g) \ - TGL_COMMUNITY(b, s, e, TGL_H_PADCFGLOCK, TGL_H_HOSTSW_OWN, g) + TGL_COMMUNITY(b, s, e, g, H)/* Tiger Lake-LP */ static const struct pinctrl_pin_desc tgllp_pins[] = {
Signature · 1 line
2.35.1
Quoted 1 line · Andy Shevchenko
Define a common COMUNITY macro and supply a variant to it.
^^^^^^^^
COMMUNITY
(ditto for other commit messages)
Quoted 3 lines
This removes some verbosity in macros.
Signed-off-by Andy Shevchenko <[email protected]>
Quoted 5 lines · Mika Westerberg
Quoted 1 line · Andy Shevchenko
Define a common COMUNITY macro and supply a variant to it.
^^^^^^^^COMMUNITY
Quoted 7 lines
(ditto for other commit messages)
Quoted 3 lines
This removes some verbosity in macros.
Signed-off-by Andy Shevchenko <[email protected]>Reviewed-by Mika Westerberg <[email protected]>
All with mentioned typo fix and added tag are pushed to my review and testing queue, thanks!
Signature · 2 lines
With Best Regards, Andy Shevchenko