Re: [PATCH v1 02/10] pinctrl: alderlake: Switch to INTEL_GPP() macro

[Mika Westerberg <mika.westerberg@linux.intel.com>]

On Tue, Nov 04, 2025 at 03:56:36PM +0100, Andy Shevchenko wrote:
> Replace custom macro with the recently defined INTEL_GPP().
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/pinctrl/intel/pinctrl-alderlake.c | 68 ++++++++++-------------
>  1 file changed, 30 insertions(+), 38 deletions(-)
> 
> diff --git a/drivers/pinctrl/intel/pinctrl-alderlake.c b/drivers/pinctrl/intel/pinctrl-alderlake.c
> index 108eac205aa9..7bf1d5c285a0 100644
> --- a/drivers/pinctrl/intel/pinctrl-alderlake.c
> +++ b/drivers/pinctrl/intel/pinctrl-alderlake.c
> @@ -27,14 +27,6 @@
>  #define ADL_S_GPI_IS		0x200
>  #define ADL_S_GPI_IE		0x220
>  
> -#define ADL_GPP(r, s, e, g)				\
> -	{						\
> -		.reg_num = (r),				\
> -		.base = (s),				\
> -		.size = ((e) - (s) + 1),		\
> -		.gpio_base = (g),			\
> -	}
> -

I wonder if simply doing this:

#define ADL_GPP(r, s, e, g)	INTEL_GPP(r, s, e, g)

is better? Then the amount of changes are smaller.

>  #define ADL_N_COMMUNITY(b, s, e, g)			\
>  	INTEL_COMMUNITY_GPPS(b, s, e, g, ADL_N)
>  
> @@ -316,28 +308,28 @@ static const struct pinctrl_pin_desc adln_pins[] = {
>  };
>  
>  static const struct intel_padgroup adln_community0_gpps[] = {
> -	ADL_GPP(0, 0, 25, 0),				/* GPP_B */
> -	ADL_GPP(1, 26, 41, 32),				/* GPP_T */
> -	ADL_GPP(2, 42, 66, 64),				/* GPP_A */
> +	INTEL_GPP(0, 0, 25, 0),				/* GPP_B */
> +	INTEL_GPP(1, 26, 41, 32),			/* GPP_T */
> +	INTEL_GPP(2, 42, 66, 64),			/* GPP_A */
>  };
>  
>  static const struct intel_padgroup adln_community1_gpps[] = {
> -	ADL_GPP(0, 67, 74, 96),				/* GPP_S */
> -	ADL_GPP(1, 75, 94, 128),			/* GPP_I */
> -	ADL_GPP(2, 95, 118, 160),			/* GPP_H */
> -	ADL_GPP(3, 119, 139, 192),			/* GPP_D */
> -	ADL_GPP(4, 140, 168, 224),			/* vGPIO */
> +	INTEL_GPP(0, 67, 74, 96),			/* GPP_S */
> +	INTEL_GPP(1, 75, 94, 128),			/* GPP_I */
> +	INTEL_GPP(2, 95, 118, 160),			/* GPP_H */
> +	INTEL_GPP(3, 119, 139, 192),			/* GPP_D */
> +	INTEL_GPP(4, 140, 168, 224),			/* vGPIO */
>  };
>  
>  static const struct intel_padgroup adln_community4_gpps[] = {
> -	ADL_GPP(0, 169, 192, 256),			/* GPP_C */
> -	ADL_GPP(1, 193, 217, 288),			/* GPP_F */
> -	ADL_GPP(2, 218, 223, INTEL_GPIO_BASE_NOMAP),	/* HVCMOS */
> -	ADL_GPP(3, 224, 248, 320),			/* GPP_E */
> +	INTEL_GPP(0, 169, 192, 256),			/* GPP_C */
> +	INTEL_GPP(1, 193, 217, 288),			/* GPP_F */
> +	INTEL_GPP(2, 218, 223, INTEL_GPIO_BASE_NOMAP),	/* HVCMOS */
> +	INTEL_GPP(3, 224, 248, 320),			/* GPP_E */
>  };
>  
>  static const struct intel_padgroup adln_community5_gpps[] = {
> -	ADL_GPP(0, 249, 256, 352),			/* GPP_R */
> +	INTEL_GPP(0, 249, 256, 352),			/* GPP_R */
>  };
>  
>  static const struct intel_community adln_communities[] = {
> @@ -680,35 +672,35 @@ static const struct pinctrl_pin_desc adls_pins[] = {
>  };
>  
>  static const struct intel_padgroup adls_community0_gpps[] = {
> -	ADL_GPP(0, 0, 24, 0),				/* GPP_I */
> -	ADL_GPP(1, 25, 47, 32),				/* GPP_R */
> -	ADL_GPP(2, 48, 59, 64),				/* GPP_J */
> -	ADL_GPP(3, 60, 86, 96),				/* vGPIO */
> -	ADL_GPP(4, 87, 94, 128),			/* vGPIO_0 */
> +	INTEL_GPP(0, 0, 24, 0),				/* GPP_I */
> +	INTEL_GPP(1, 25, 47, 32),			/* GPP_R */
> +	INTEL_GPP(2, 48, 59, 64),			/* GPP_J */
> +	INTEL_GPP(3, 60, 86, 96),			/* vGPIO */
> +	INTEL_GPP(4, 87, 94, 128),			/* vGPIO_0 */
>  };
>  
>  static const struct intel_padgroup adls_community1_gpps[] = {
> -	ADL_GPP(0, 95, 118, 160),			/* GPP_B */
> -	ADL_GPP(1, 119, 126, 192),			/* GPP_G */
> -	ADL_GPP(2, 127, 150, 224),			/* GPP_H */
> +	INTEL_GPP(0, 95, 118, 160),			/* GPP_B */
> +	INTEL_GPP(1, 119, 126, 192),			/* GPP_G */
> +	INTEL_GPP(2, 127, 150, 224),			/* GPP_H */
>  };
>  
>  static const struct intel_padgroup adls_community3_gpps[] = {
> -	ADL_GPP(0, 151, 159, INTEL_GPIO_BASE_NOMAP),	/* SPI0 */
> -	ADL_GPP(1, 160, 175, 256),			/* GPP_A */
> -	ADL_GPP(2, 176, 199, 288),			/* GPP_C */
> +	INTEL_GPP(0, 151, 159, INTEL_GPIO_BASE_NOMAP),	/* SPI0 */
> +	INTEL_GPP(1, 160, 175, 256),			/* GPP_A */
> +	INTEL_GPP(2, 176, 199, 288),			/* GPP_C */
>  };
>  
>  static const struct intel_padgroup adls_community4_gpps[] = {
> -	ADL_GPP(0, 200, 207, 320),			/* GPP_S */
> -	ADL_GPP(1, 208, 230, 352),			/* GPP_E */
> -	ADL_GPP(2, 231, 245, 384),			/* GPP_K */
> -	ADL_GPP(3, 246, 269, 416),			/* GPP_F */
> +	INTEL_GPP(0, 200, 207, 320),			/* GPP_S */
> +	INTEL_GPP(1, 208, 230, 352),			/* GPP_E */
> +	INTEL_GPP(2, 231, 245, 384),			/* GPP_K */
> +	INTEL_GPP(3, 246, 269, 416),			/* GPP_F */
>  };
>  
>  static const struct intel_padgroup adls_community5_gpps[] = {
> -	ADL_GPP(0, 270, 294, 448),			/* GPP_D */
> -	ADL_GPP(1, 295, 303, INTEL_GPIO_BASE_NOMAP),	/* JTAG */
> +	INTEL_GPP(0, 270, 294, 448),			/* GPP_D */
> +	INTEL_GPP(1, 295, 303, INTEL_GPIO_BASE_NOMAP),	/* JTAG */
>  };
>  
>  static const struct intel_community adls_communities[] = {
> -- 
> 2.50.1