Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+23 -31
+23 -31
drivers/pinctrl/intel/pinctrl-meteorlake.c
··· 27 27 #define MTL_S_GPI_IS 0x200 28 28 #define MTL_S_GPI_IE 0x210 29 29 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 - 38 30 #define MTL_P_COMMUNITY(b, s, e, g) \ 39 31 INTEL_COMMUNITY_GPPS(b, s, e, g, MTL_P) 40 32 ··· 341 349 }; 342 350 343 351 static const struct intel_padgroup mtlp_community0_gpps[] = { 344 - MTL_GPP(0, 0, 4, 0), /* CPU */ 345 - MTL_GPP(1, 5, 28, 32), /* GPP_V */ 346 - MTL_GPP(2, 29, 52, 64), /* GPP_C */ 352 + INTEL_GPP(0, 0, 4, 0), /* CPU */ 353 + INTEL_GPP(1, 5, 28, 32), /* GPP_V */ 354 + INTEL_GPP(2, 29, 52, 64), /* GPP_C */ 347 355 }; 348 356 349 357 static const struct intel_padgroup mtlp_community1_gpps[] = { 350 - MTL_GPP(0, 53, 77, 96), /* GPP_A */ 351 - MTL_GPP(1, 78, 102, 128), /* GPP_E */ 358 + INTEL_GPP(0, 53, 77, 96), /* GPP_A */ 359 + INTEL_GPP(1, 78, 102, 128), /* GPP_E */ 352 360 }; 353 361 354 362 static const struct intel_padgroup mtlp_community3_gpps[] = { 355 - MTL_GPP(0, 103, 128, 160), /* GPP_H */ 356 - MTL_GPP(1, 129, 154, 192), /* GPP_F */ 357 - MTL_GPP(2, 155, 169, 224), /* SPI0 */ 358 - MTL_GPP(3, 170, 183, 256), /* vGPIO_3 */ 363 + INTEL_GPP(0, 103, 128, 160), /* GPP_H */ 364 + INTEL_GPP(1, 129, 154, 192), /* GPP_F */ 365 + INTEL_GPP(2, 155, 169, 224), /* SPI0 */ 366 + INTEL_GPP(3, 170, 183, 256), /* vGPIO_3 */ 359 367 }; 360 368 361 369 static const struct intel_padgroup mtlp_community4_gpps[] = { 362 - MTL_GPP(0, 184, 191, 288), /* GPP_S */ 363 - MTL_GPP(1, 192, 203, 320), /* JTAG */ 370 + INTEL_GPP(0, 184, 191, 288), /* GPP_S */ 371 + INTEL_GPP(1, 192, 203, 320), /* JTAG */ 364 372 }; 365 373 366 374 static const struct intel_padgroup mtlp_community5_gpps[] = { 367 - MTL_GPP(0, 204, 228, 352), /* GPP_B */ 368 - MTL_GPP(1, 229, 253, 384), /* GPP_D */ 369 - MTL_GPP(2, 254, 285, 416), /* vGPIO_0 */ 370 - MTL_GPP(3, 286, 288, 448), /* vGPIO_1 */ 375 + INTEL_GPP(0, 204, 228, 352), /* GPP_B */ 376 + INTEL_GPP(1, 229, 253, 384), /* GPP_D */ 377 + INTEL_GPP(2, 254, 285, 416), /* vGPIO_0 */ 378 + INTEL_GPP(3, 286, 288, 448), /* vGPIO_1 */ 371 379 }; 372 380 373 381 static const struct intel_community mtlp_communities[] = { ··· 546 554 }; 547 555 548 556 static const struct intel_padgroup mtls_community0_gpps[] = { 549 - MTL_GPP(0, 0, 27, 0), /* GPP_A */ 550 - MTL_GPP(1, 28, 46, 32), /* vGPIO_0 */ 551 - MTL_GPP(2, 47, 73, 64), /* GPP_C */ 557 + INTEL_GPP(0, 0, 27, 0), /* GPP_A */ 558 + INTEL_GPP(1, 28, 46, 32), /* vGPIO_0 */ 559 + INTEL_GPP(2, 47, 73, 64), /* GPP_C */ 552 560 }; 553 561 554 562 static const struct intel_padgroup mtls_community1_gpps[] = { 555 - MTL_GPP(0, 74, 93, 96), /* GPP_B */ 556 - MTL_GPP(1, 94, 95, 128), /* vGPIO_3 */ 557 - MTL_GPP(2, 96, 119, 160), /* GPP_D */ 563 + INTEL_GPP(0, 74, 93, 96), /* GPP_B */ 564 + INTEL_GPP(1, 94, 95, 128), /* vGPIO_3 */ 565 + INTEL_GPP(2, 96, 119, 160), /* GPP_D */ 558 566 }; 559 567 560 568 static const struct intel_padgroup mtls_community3_gpps[] = { 561 - MTL_GPP(0, 120, 135, 192), /* JTAG_CPU */ 562 - MTL_GPP(1, 136, 147, 224), /* vGPIO_4 */ 569 + INTEL_GPP(0, 120, 135, 192), /* JTAG_CPU */ 570 + INTEL_GPP(1, 136, 147, 224), /* vGPIO_4 */ 563 571 }; 564 572 565 573 static const struct intel_community mtls_communities[] = {