Skip to content

Commit cac89a3

Browse files
committed
pinctrl: meteorlake: Switch to INTEL_GPP() macro
Replace custom macro with the recently defined INTEL_GPP(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent c11e90d commit cac89a3

1 file changed

Lines changed: 23 additions & 31 deletions

File tree

drivers/pinctrl/intel/pinctrl-meteorlake.c

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,6 @@
2727
#define MTL_S_GPI_IS 0x200
2828
#define MTL_S_GPI_IE 0x210
2929

30-
#define MTL_GPP(r, s, e, g) \
31-
{ \
32-
.reg_num = (r), \
33-
.base = (s), \
34-
.size = ((e) - (s) + 1), \
35-
.gpio_base = (g), \
36-
}
37-
3830
#define MTL_P_COMMUNITY(b, s, e, g) \
3931
INTEL_COMMUNITY_GPPS(b, s, e, g, MTL_P)
4032

@@ -349,33 +341,33 @@ static const struct pinctrl_pin_desc mtlp_pins[] = {
349341
};
350342

351343
static const struct intel_padgroup mtlp_community0_gpps[] = {
352-
MTL_GPP(0, 0, 4, 0), /* CPU */
353-
MTL_GPP(1, 5, 28, 32), /* GPP_V */
354-
MTL_GPP(2, 29, 52, 64), /* GPP_C */
344+
INTEL_GPP(0, 0, 4, 0), /* CPU */
345+
INTEL_GPP(1, 5, 28, 32), /* GPP_V */
346+
INTEL_GPP(2, 29, 52, 64), /* GPP_C */
355347
};
356348

357349
static const struct intel_padgroup mtlp_community1_gpps[] = {
358-
MTL_GPP(0, 53, 77, 96), /* GPP_A */
359-
MTL_GPP(1, 78, 102, 128), /* GPP_E */
350+
INTEL_GPP(0, 53, 77, 96), /* GPP_A */
351+
INTEL_GPP(1, 78, 102, 128), /* GPP_E */
360352
};
361353

362354
static const struct intel_padgroup mtlp_community3_gpps[] = {
363-
MTL_GPP(0, 103, 128, 160), /* GPP_H */
364-
MTL_GPP(1, 129, 154, 192), /* GPP_F */
365-
MTL_GPP(2, 155, 169, 224), /* SPI0 */
366-
MTL_GPP(3, 170, 183, 256), /* vGPIO_3 */
355+
INTEL_GPP(0, 103, 128, 160), /* GPP_H */
356+
INTEL_GPP(1, 129, 154, 192), /* GPP_F */
357+
INTEL_GPP(2, 155, 169, 224), /* SPI0 */
358+
INTEL_GPP(3, 170, 183, 256), /* vGPIO_3 */
367359
};
368360

369361
static const struct intel_padgroup mtlp_community4_gpps[] = {
370-
MTL_GPP(0, 184, 191, 288), /* GPP_S */
371-
MTL_GPP(1, 192, 203, 320), /* JTAG */
362+
INTEL_GPP(0, 184, 191, 288), /* GPP_S */
363+
INTEL_GPP(1, 192, 203, 320), /* JTAG */
372364
};
373365

374366
static const struct intel_padgroup mtlp_community5_gpps[] = {
375-
MTL_GPP(0, 204, 228, 352), /* GPP_B */
376-
MTL_GPP(1, 229, 253, 384), /* GPP_D */
377-
MTL_GPP(2, 254, 285, 416), /* vGPIO_0 */
378-
MTL_GPP(3, 286, 288, 448), /* vGPIO_1 */
367+
INTEL_GPP(0, 204, 228, 352), /* GPP_B */
368+
INTEL_GPP(1, 229, 253, 384), /* GPP_D */
369+
INTEL_GPP(2, 254, 285, 416), /* vGPIO_0 */
370+
INTEL_GPP(3, 286, 288, 448), /* vGPIO_1 */
379371
};
380372

381373
static const struct intel_community mtlp_communities[] = {
@@ -554,20 +546,20 @@ static const struct pinctrl_pin_desc mtls_pins[] = {
554546
};
555547

556548
static const struct intel_padgroup mtls_community0_gpps[] = {
557-
MTL_GPP(0, 0, 27, 0), /* GPP_A */
558-
MTL_GPP(1, 28, 46, 32), /* vGPIO_0 */
559-
MTL_GPP(2, 47, 73, 64), /* GPP_C */
549+
INTEL_GPP(0, 0, 27, 0), /* GPP_A */
550+
INTEL_GPP(1, 28, 46, 32), /* vGPIO_0 */
551+
INTEL_GPP(2, 47, 73, 64), /* GPP_C */
560552
};
561553

562554
static const struct intel_padgroup mtls_community1_gpps[] = {
563-
MTL_GPP(0, 74, 93, 96), /* GPP_B */
564-
MTL_GPP(1, 94, 95, 128), /* vGPIO_3 */
565-
MTL_GPP(2, 96, 119, 160), /* GPP_D */
555+
INTEL_GPP(0, 74, 93, 96), /* GPP_B */
556+
INTEL_GPP(1, 94, 95, 128), /* vGPIO_3 */
557+
INTEL_GPP(2, 96, 119, 160), /* GPP_D */
566558
};
567559

568560
static const struct intel_padgroup mtls_community3_gpps[] = {
569-
MTL_GPP(0, 120, 135, 192), /* JTAG_CPU */
570-
MTL_GPP(1, 136, 147, 224), /* vGPIO_4 */
561+
INTEL_GPP(0, 120, 135, 192), /* JTAG_CPU */
562+
INTEL_GPP(1, 136, 147, 224), /* vGPIO_4 */
571563
};
572564

573565
static const struct intel_community mtls_communities[] = {

0 commit comments

Comments
 (0)