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

Merge patch series "pinctrl: intel: Consolidate struct intel_padgroup initialisers"

Andy Shevchenko <andriy.shevchenko@linux.intel.com> says:

We have plenty of repetitive *_GPP() macros across the drivers.
Consolidate them under a newly introduced INTEL_GPP().

Link: https://patch.msgid.link/20251104145814.1018867-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Andy Shevchenko 396f45a3 ce272781

+199 -262
+30 -38
drivers/pinctrl/intel/pinctrl-alderlake.c
··· 27 27 #define ADL_S_GPI_IS 0x200 28 28 #define ADL_S_GPI_IE 0x220 29 29 30 - #define ADL_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 ADL_N_COMMUNITY(b, s, e, g) \ 39 31 INTEL_COMMUNITY_GPPS(b, s, e, g, ADL_N) 40 32 ··· 308 316 }; 309 317 310 318 static const struct intel_padgroup adln_community0_gpps[] = { 311 - ADL_GPP(0, 0, 25, 0), /* GPP_B */ 312 - ADL_GPP(1, 26, 41, 32), /* GPP_T */ 313 - ADL_GPP(2, 42, 66, 64), /* GPP_A */ 319 + INTEL_GPP(0, 0, 25, 0), /* GPP_B */ 320 + INTEL_GPP(1, 26, 41, 32), /* GPP_T */ 321 + INTEL_GPP(2, 42, 66, 64), /* GPP_A */ 314 322 }; 315 323 316 324 static const struct intel_padgroup adln_community1_gpps[] = { 317 - ADL_GPP(0, 67, 74, 96), /* GPP_S */ 318 - ADL_GPP(1, 75, 94, 128), /* GPP_I */ 319 - ADL_GPP(2, 95, 118, 160), /* GPP_H */ 320 - ADL_GPP(3, 119, 139, 192), /* GPP_D */ 321 - ADL_GPP(4, 140, 168, 224), /* vGPIO */ 325 + INTEL_GPP(0, 67, 74, 96), /* GPP_S */ 326 + INTEL_GPP(1, 75, 94, 128), /* GPP_I */ 327 + INTEL_GPP(2, 95, 118, 160), /* GPP_H */ 328 + INTEL_GPP(3, 119, 139, 192), /* GPP_D */ 329 + INTEL_GPP(4, 140, 168, 224), /* vGPIO */ 322 330 }; 323 331 324 332 static const struct intel_padgroup adln_community4_gpps[] = { 325 - ADL_GPP(0, 169, 192, 256), /* GPP_C */ 326 - ADL_GPP(1, 193, 217, 288), /* GPP_F */ 327 - ADL_GPP(2, 218, 223, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 328 - ADL_GPP(3, 224, 248, 320), /* GPP_E */ 333 + INTEL_GPP(0, 169, 192, 256), /* GPP_C */ 334 + INTEL_GPP(1, 193, 217, 288), /* GPP_F */ 335 + INTEL_GPP(2, 218, 223, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 336 + INTEL_GPP(3, 224, 248, 320), /* GPP_E */ 329 337 }; 330 338 331 339 static const struct intel_padgroup adln_community5_gpps[] = { 332 - ADL_GPP(0, 249, 256, 352), /* GPP_R */ 340 + INTEL_GPP(0, 249, 256, 352), /* GPP_R */ 333 341 }; 334 342 335 343 static const struct intel_community adln_communities[] = { ··· 672 680 }; 673 681 674 682 static const struct intel_padgroup adls_community0_gpps[] = { 675 - ADL_GPP(0, 0, 24, 0), /* GPP_I */ 676 - ADL_GPP(1, 25, 47, 32), /* GPP_R */ 677 - ADL_GPP(2, 48, 59, 64), /* GPP_J */ 678 - ADL_GPP(3, 60, 86, 96), /* vGPIO */ 679 - ADL_GPP(4, 87, 94, 128), /* vGPIO_0 */ 683 + INTEL_GPP(0, 0, 24, 0), /* GPP_I */ 684 + INTEL_GPP(1, 25, 47, 32), /* GPP_R */ 685 + INTEL_GPP(2, 48, 59, 64), /* GPP_J */ 686 + INTEL_GPP(3, 60, 86, 96), /* vGPIO */ 687 + INTEL_GPP(4, 87, 94, 128), /* vGPIO_0 */ 680 688 }; 681 689 682 690 static const struct intel_padgroup adls_community1_gpps[] = { 683 - ADL_GPP(0, 95, 118, 160), /* GPP_B */ 684 - ADL_GPP(1, 119, 126, 192), /* GPP_G */ 685 - ADL_GPP(2, 127, 150, 224), /* GPP_H */ 691 + INTEL_GPP(0, 95, 118, 160), /* GPP_B */ 692 + INTEL_GPP(1, 119, 126, 192), /* GPP_G */ 693 + INTEL_GPP(2, 127, 150, 224), /* GPP_H */ 686 694 }; 687 695 688 696 static const struct intel_padgroup adls_community3_gpps[] = { 689 - ADL_GPP(0, 151, 159, INTEL_GPIO_BASE_NOMAP), /* SPI0 */ 690 - ADL_GPP(1, 160, 175, 256), /* GPP_A */ 691 - ADL_GPP(2, 176, 199, 288), /* GPP_C */ 697 + INTEL_GPP(0, 151, 159, INTEL_GPIO_BASE_NOMAP), /* SPI0 */ 698 + INTEL_GPP(1, 160, 175, 256), /* GPP_A */ 699 + INTEL_GPP(2, 176, 199, 288), /* GPP_C */ 692 700 }; 693 701 694 702 static const struct intel_padgroup adls_community4_gpps[] = { 695 - ADL_GPP(0, 200, 207, 320), /* GPP_S */ 696 - ADL_GPP(1, 208, 230, 352), /* GPP_E */ 697 - ADL_GPP(2, 231, 245, 384), /* GPP_K */ 698 - ADL_GPP(3, 246, 269, 416), /* GPP_F */ 703 + INTEL_GPP(0, 200, 207, 320), /* GPP_S */ 704 + INTEL_GPP(1, 208, 230, 352), /* GPP_E */ 705 + INTEL_GPP(2, 231, 245, 384), /* GPP_K */ 706 + INTEL_GPP(3, 246, 269, 416), /* GPP_F */ 699 707 }; 700 708 701 709 static const struct intel_padgroup adls_community5_gpps[] = { 702 - ADL_GPP(0, 270, 294, 448), /* GPP_D */ 703 - ADL_GPP(1, 295, 303, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 710 + INTEL_GPP(0, 270, 294, 448), /* GPP_D */ 711 + INTEL_GPP(1, 295, 303, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 704 712 }; 705 713 706 714 static const struct intel_community adls_communities[] = {
+30 -38
drivers/pinctrl/intel/pinctrl-cannonlake.c
··· 28 28 #define CNL_H_GPI_IS 0x100 29 29 #define CNL_H_GPI_IE 0x120 30 30 31 - #define CNL_GPP(r, s, e, g) \ 32 - { \ 33 - .reg_num = (r), \ 34 - .base = (s), \ 35 - .size = ((e) - (s) + 1), \ 36 - .gpio_base = (g), \ 37 - } 38 - 39 31 #define CNL_LP_COMMUNITY(b, s, e, g) \ 40 32 INTEL_COMMUNITY_GPPS(b, s, e, g, CNL_LP) 41 33 ··· 354 362 }; 355 363 356 364 static const struct intel_padgroup cnlh_community0_gpps[] = { 357 - CNL_GPP(0, 0, 24, 0), /* GPP_A */ 358 - CNL_GPP(1, 25, 50, 32), /* GPP_B */ 365 + INTEL_GPP(0, 0, 24, 0), /* GPP_A */ 366 + INTEL_GPP(1, 25, 50, 32), /* GPP_B */ 359 367 }; 360 368 361 369 static const struct intel_padgroup cnlh_community1_gpps[] = { 362 - CNL_GPP(0, 51, 74, 64), /* GPP_C */ 363 - CNL_GPP(1, 75, 98, 96), /* GPP_D */ 364 - CNL_GPP(2, 99, 106, 128), /* GPP_G */ 365 - CNL_GPP(3, 107, 114, INTEL_GPIO_BASE_NOMAP), /* AZA */ 366 - CNL_GPP(4, 115, 146, 160), /* vGPIO_0 */ 367 - CNL_GPP(5, 147, 154, INTEL_GPIO_BASE_NOMAP), /* vGPIO_1 */ 370 + INTEL_GPP(0, 51, 74, 64), /* GPP_C */ 371 + INTEL_GPP(1, 75, 98, 96), /* GPP_D */ 372 + INTEL_GPP(2, 99, 106, 128), /* GPP_G */ 373 + INTEL_GPP(3, 107, 114, INTEL_GPIO_BASE_NOMAP), /* AZA */ 374 + INTEL_GPP(4, 115, 146, 160), /* vGPIO_0 */ 375 + INTEL_GPP(5, 147, 154, INTEL_GPIO_BASE_NOMAP), /* vGPIO_1 */ 368 376 }; 369 377 370 378 static const struct intel_padgroup cnlh_community3_gpps[] = { 371 - CNL_GPP(0, 155, 178, 192), /* GPP_K */ 372 - CNL_GPP(1, 179, 202, 224), /* GPP_H */ 373 - CNL_GPP(2, 203, 215, 256), /* GPP_E */ 374 - CNL_GPP(3, 216, 239, 288), /* GPP_F */ 375 - CNL_GPP(4, 240, 248, INTEL_GPIO_BASE_NOMAP), /* SPI */ 379 + INTEL_GPP(0, 155, 178, 192), /* GPP_K */ 380 + INTEL_GPP(1, 179, 202, 224), /* GPP_H */ 381 + INTEL_GPP(2, 203, 215, 256), /* GPP_E */ 382 + INTEL_GPP(3, 216, 239, 288), /* GPP_F */ 383 + INTEL_GPP(4, 240, 248, INTEL_GPIO_BASE_NOMAP), /* SPI */ 376 384 }; 377 385 378 386 static const struct intel_padgroup cnlh_community4_gpps[] = { 379 - CNL_GPP(0, 249, 259, INTEL_GPIO_BASE_NOMAP), /* CPU */ 380 - CNL_GPP(1, 260, 268, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 381 - CNL_GPP(2, 269, 286, 320), /* GPP_I */ 382 - CNL_GPP(3, 287, 298, 352), /* GPP_J */ 387 + INTEL_GPP(0, 249, 259, INTEL_GPIO_BASE_NOMAP), /* CPU */ 388 + INTEL_GPP(1, 260, 268, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 389 + INTEL_GPP(2, 269, 286, 320), /* GPP_I */ 390 + INTEL_GPP(3, 287, 298, 352), /* GPP_J */ 383 391 }; 384 392 385 393 static const unsigned int cnlh_spi0_pins[] = { 40, 41, 42, 43 }; ··· 772 780 }; 773 781 774 782 static const struct intel_padgroup cnllp_community0_gpps[] = { 775 - CNL_GPP(0, 0, 24, 0), /* GPP_A */ 776 - CNL_GPP(1, 25, 50, 32), /* GPP_B */ 777 - CNL_GPP(2, 51, 58, 64), /* GPP_G */ 778 - CNL_GPP(3, 59, 67, INTEL_GPIO_BASE_NOMAP), /* SPI */ 783 + INTEL_GPP(0, 0, 24, 0), /* GPP_A */ 784 + INTEL_GPP(1, 25, 50, 32), /* GPP_B */ 785 + INTEL_GPP(2, 51, 58, 64), /* GPP_G */ 786 + INTEL_GPP(3, 59, 67, INTEL_GPIO_BASE_NOMAP), /* SPI */ 779 787 }; 780 788 781 789 static const struct intel_padgroup cnllp_community1_gpps[] = { 782 - CNL_GPP(0, 68, 92, 96), /* GPP_D */ 783 - CNL_GPP(1, 93, 116, 128), /* GPP_F */ 784 - CNL_GPP(2, 117, 140, 160), /* GPP_H */ 785 - CNL_GPP(3, 141, 172, 192), /* vGPIO */ 786 - CNL_GPP(4, 173, 180, 224), /* vGPIO */ 790 + INTEL_GPP(0, 68, 92, 96), /* GPP_D */ 791 + INTEL_GPP(1, 93, 116, 128), /* GPP_F */ 792 + INTEL_GPP(2, 117, 140, 160), /* GPP_H */ 793 + INTEL_GPP(3, 141, 172, 192), /* vGPIO */ 794 + INTEL_GPP(4, 173, 180, 224), /* vGPIO */ 787 795 }; 788 796 789 797 static const struct intel_padgroup cnllp_community4_gpps[] = { 790 - CNL_GPP(0, 181, 204, 256), /* GPP_C */ 791 - CNL_GPP(1, 205, 228, 288), /* GPP_E */ 792 - CNL_GPP(2, 229, 237, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 793 - CNL_GPP(3, 238, 243, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 798 + INTEL_GPP(0, 181, 204, 256), /* GPP_C */ 799 + INTEL_GPP(1, 205, 228, 288), /* GPP_E */ 800 + INTEL_GPP(2, 229, 237, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 801 + INTEL_GPP(3, 238, 243, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 794 802 }; 795 803 796 804 static const struct intel_community cnllp_communities[] = {
+26 -34
drivers/pinctrl/intel/pinctrl-icelake.c
··· 28 28 #define ICL_N_GPI_IS 0x100 29 29 #define ICL_N_GPI_IE 0x120 30 30 31 - #define ICL_GPP(r, s, e, g) \ 32 - { \ 33 - .reg_num = (r), \ 34 - .base = (s), \ 35 - .size = ((e) - (s) + 1), \ 36 - .gpio_base = (g), \ 37 - } 38 - 39 31 #define ICL_LP_COMMUNITY(b, s, e, g) \ 40 32 INTEL_COMMUNITY_GPPS(b, s, e, g, ICL_LP) 41 33 ··· 294 302 }; 295 303 296 304 static const struct intel_padgroup icllp_community0_gpps[] = { 297 - ICL_GPP(0, 0, 7, 0), /* GPP_G */ 298 - ICL_GPP(1, 8, 33, 32), /* GPP_B */ 299 - ICL_GPP(2, 34, 58, 64), /* GPP_A */ 305 + INTEL_GPP(0, 0, 7, 0), /* GPP_G */ 306 + INTEL_GPP(1, 8, 33, 32), /* GPP_B */ 307 + INTEL_GPP(2, 34, 58, 64), /* GPP_A */ 300 308 }; 301 309 302 310 static const struct intel_padgroup icllp_community1_gpps[] = { 303 - ICL_GPP(0, 59, 82, 96), /* GPP_H */ 304 - ICL_GPP(1, 83, 103, 128), /* GPP_D */ 305 - ICL_GPP(2, 104, 123, 160), /* GPP_F */ 306 - ICL_GPP(3, 124, 152, 192), /* vGPIO */ 311 + INTEL_GPP(0, 59, 82, 96), /* GPP_H */ 312 + INTEL_GPP(1, 83, 103, 128), /* GPP_D */ 313 + INTEL_GPP(2, 104, 123, 160), /* GPP_F */ 314 + INTEL_GPP(3, 124, 152, 192), /* vGPIO */ 307 315 }; 308 316 309 317 static const struct intel_padgroup icllp_community4_gpps[] = { 310 - ICL_GPP(0, 153, 176, 224), /* GPP_C */ 311 - ICL_GPP(1, 177, 182, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 312 - ICL_GPP(2, 183, 206, 256), /* GPP_E */ 313 - ICL_GPP(3, 207, 215, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 318 + INTEL_GPP(0, 153, 176, 224), /* GPP_C */ 319 + INTEL_GPP(1, 177, 182, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 320 + INTEL_GPP(2, 183, 206, 256), /* GPP_E */ 321 + INTEL_GPP(3, 207, 215, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 314 322 }; 315 323 316 324 static const struct intel_padgroup icllp_community5_gpps[] = { 317 - ICL_GPP(0, 216, 223, 288), /* GPP_R */ 318 - ICL_GPP(1, 224, 231, 320), /* GPP_S */ 319 - ICL_GPP(2, 232, 240, INTEL_GPIO_BASE_NOMAP), /* SPI */ 325 + INTEL_GPP(0, 216, 223, 288), /* GPP_R */ 326 + INTEL_GPP(1, 224, 231, 320), /* GPP_S */ 327 + INTEL_GPP(2, 232, 240, INTEL_GPIO_BASE_NOMAP), /* SPI */ 320 328 }; 321 329 322 330 static const struct intel_community icllp_communities[] = { ··· 624 632 }; 625 633 626 634 static const struct intel_padgroup icln_community0_gpps[] = { 627 - ICL_GPP(0, 0, 8, INTEL_GPIO_BASE_NOMAP), /* SPI */ 628 - ICL_GPP(1, 9, 34, 32), /* GPP_B */ 629 - ICL_GPP(2, 35, 55, 64), /* GPP_A */ 630 - ICL_GPP(3, 56, 63, 96), /* GPP_S */ 631 - ICL_GPP(4, 64, 71, 128), /* GPP_R */ 635 + INTEL_GPP(0, 0, 8, INTEL_GPIO_BASE_NOMAP), /* SPI */ 636 + INTEL_GPP(1, 9, 34, 32), /* GPP_B */ 637 + INTEL_GPP(2, 35, 55, 64), /* GPP_A */ 638 + INTEL_GPP(3, 56, 63, 96), /* GPP_S */ 639 + INTEL_GPP(4, 64, 71, 128), /* GPP_R */ 632 640 }; 633 641 634 642 static const struct intel_padgroup icln_community1_gpps[] = { 635 - ICL_GPP(0, 72, 95, 160), /* GPP_H */ 636 - ICL_GPP(1, 96, 121, 192), /* GPP_D */ 637 - ICL_GPP(2, 122, 150, 224), /* vGPIO */ 638 - ICL_GPP(3, 151, 174, 256), /* GPP_C */ 643 + INTEL_GPP(0, 72, 95, 160), /* GPP_H */ 644 + INTEL_GPP(1, 96, 121, 192), /* GPP_D */ 645 + INTEL_GPP(2, 122, 150, 224), /* vGPIO */ 646 + INTEL_GPP(3, 151, 174, 256), /* GPP_C */ 639 647 }; 640 648 641 649 static const struct intel_padgroup icln_community4_gpps[] = { 642 - ICL_GPP(0, 175, 180, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 643 - ICL_GPP(1, 181, 204, 288), /* GPP_E */ 650 + INTEL_GPP(0, 175, 180, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 651 + INTEL_GPP(1, 181, 204, 288), /* GPP_E */ 644 652 }; 645 653 646 654 static const struct intel_padgroup icln_community5_gpps[] = { 647 - ICL_GPP(0, 205, 212, INTEL_GPIO_BASE_ZERO), /* GPP_G */ 655 + INTEL_GPP(0, 205, 212, INTEL_GPIO_BASE_ZERO), /* GPP_G */ 648 656 }; 649 657 650 658 static const struct intel_community icln_communities[] = {
+9
drivers/pinctrl/intel/pinctrl-intel.h
··· 76 76 INTEL_GPIO_BASE_MATCH = 0, 77 77 }; 78 78 79 + /* Initialise struct intel_padgroup */ 80 + #define INTEL_GPP(r, s, e, g) \ 81 + { \ 82 + .reg_num = (r), \ 83 + .base = (s), \ 84 + .size = ((e) - (s) + 1), \ 85 + .gpio_base = (g), \ 86 + } 87 + 79 88 /** 80 89 * struct intel_community - Intel pin community description 81 90 * @barno: MMIO BAR number where registers for this community reside
+13 -21
drivers/pinctrl/intel/pinctrl-jasperlake.c
··· 21 21 #define JSL_GPI_IS 0x100 22 22 #define JSL_GPI_IE 0x120 23 23 24 - #define JSL_GPP(r, s, e, g) \ 25 - { \ 26 - .reg_num = (r), \ 27 - .base = (s), \ 28 - .size = ((e) - (s) + 1), \ 29 - .gpio_base = (g), \ 30 - } 31 - 32 24 #define JSL_COMMUNITY(b, s, e, g) \ 33 25 INTEL_COMMUNITY_GPPS(b, s, e, g, JSL) 34 26 ··· 275 283 }; 276 284 277 285 static const struct intel_padgroup jsl_community0_gpps[] = { 278 - JSL_GPP(0, 0, 19, 320), /* GPP_F */ 279 - JSL_GPP(1, 20, 28, INTEL_GPIO_BASE_NOMAP), /* SPI */ 280 - JSL_GPP(2, 29, 54, 32), /* GPP_B */ 281 - JSL_GPP(3, 55, 75, 64), /* GPP_A */ 282 - JSL_GPP(4, 76, 83, 96), /* GPP_S */ 283 - JSL_GPP(5, 84, 91, 128), /* GPP_R */ 286 + INTEL_GPP(0, 0, 19, 320), /* GPP_F */ 287 + INTEL_GPP(1, 20, 28, INTEL_GPIO_BASE_NOMAP), /* SPI */ 288 + INTEL_GPP(2, 29, 54, 32), /* GPP_B */ 289 + INTEL_GPP(3, 55, 75, 64), /* GPP_A */ 290 + INTEL_GPP(4, 76, 83, 96), /* GPP_S */ 291 + INTEL_GPP(5, 84, 91, 128), /* GPP_R */ 284 292 }; 285 293 286 294 static const struct intel_padgroup jsl_community1_gpps[] = { 287 - JSL_GPP(0, 92, 115, 160), /* GPP_H */ 288 - JSL_GPP(1, 116, 141, 192), /* GPP_D */ 289 - JSL_GPP(2, 142, 170, 224), /* vGPIO */ 290 - JSL_GPP(3, 171, 194, 256), /* GPP_C */ 295 + INTEL_GPP(0, 92, 115, 160), /* GPP_H */ 296 + INTEL_GPP(1, 116, 141, 192), /* GPP_D */ 297 + INTEL_GPP(2, 142, 170, 224), /* vGPIO */ 298 + INTEL_GPP(3, 171, 194, 256), /* GPP_C */ 291 299 }; 292 300 293 301 static const struct intel_padgroup jsl_community4_gpps[] = { 294 - JSL_GPP(0, 195, 200, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 295 - JSL_GPP(1, 201, 224, 288), /* GPP_E */ 302 + INTEL_GPP(0, 195, 200, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 303 + INTEL_GPP(1, 201, 224, 288), /* GPP_E */ 296 304 }; 297 305 298 306 static const struct intel_padgroup jsl_community5_gpps[] = { 299 - JSL_GPP(0, 225, 232, INTEL_GPIO_BASE_ZERO), /* GPP_G */ 307 + INTEL_GPP(0, 225, 232, INTEL_GPIO_BASE_ZERO), /* GPP_G */ 300 308 }; 301 309 302 310 static const struct intel_community jsl_communities[] = {
+9 -17
drivers/pinctrl/intel/pinctrl-lakefield.c
··· 21 21 #define LKF_GPI_IS 0x100 22 22 #define LKF_GPI_IE 0x110 23 23 24 - #define LKF_GPP(r, s, e, g) \ 25 - { \ 26 - .reg_num = (r), \ 27 - .base = (s), \ 28 - .size = ((e) - (s) + 1), \ 29 - .gpio_base = (g), \ 30 - } 31 - 32 24 #define LKF_COMMUNITY(b, s, e, g) \ 33 25 INTEL_COMMUNITY_GPPS(b, s, e, g, LKF) 34 26 ··· 300 308 }; 301 309 302 310 static const struct intel_padgroup lkf_community0_gpps[] = { 303 - LKF_GPP(0, 0, 31, 0), /* EAST_0 */ 304 - LKF_GPP(1, 32, 59, 32), /* EAST_1 */ 311 + INTEL_GPP(0, 0, 31, 0), /* EAST_0 */ 312 + INTEL_GPP(1, 32, 59, 32), /* EAST_1 */ 305 313 }; 306 314 307 315 static const struct intel_padgroup lkf_community1_gpps[] = { 308 - LKF_GPP(0, 60, 91, 64), /* NORTHWEST_0 */ 309 - LKF_GPP(1, 92, 123, 96), /* NORTHWEST_1 */ 310 - LKF_GPP(2, 124, 148, 128), /* NORTHWEST_2 */ 316 + INTEL_GPP(0, 60, 91, 64), /* NORTHWEST_0 */ 317 + INTEL_GPP(1, 92, 123, 96), /* NORTHWEST_1 */ 318 + INTEL_GPP(2, 124, 148, 128), /* NORTHWEST_2 */ 311 319 }; 312 320 313 321 static const struct intel_padgroup lkf_community2_gpps[] = { 314 - LKF_GPP(0, 149, 180, 160), /* WEST_0 */ 315 - LKF_GPP(1, 181, 212, 192), /* WEST_1 */ 316 - LKF_GPP(2, 213, 237, 224), /* WEST_2 */ 322 + INTEL_GPP(0, 149, 180, 160), /* WEST_0 */ 323 + INTEL_GPP(1, 181, 212, 192), /* WEST_1 */ 324 + INTEL_GPP(2, 213, 237, 224), /* WEST_2 */ 317 325 }; 318 326 319 327 static const struct intel_padgroup lkf_community3_gpps[] = { 320 - LKF_GPP(0, 238, 266, 256), /* SOUTHEAST */ 328 + INTEL_GPP(0, 238, 266, 256), /* SOUTHEAST */ 321 329 }; 322 330 323 331 static const struct intel_community lkf_communities[] = {
+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[] = {
+19 -27
drivers/pinctrl/intel/pinctrl-meteorpoint.c
··· 21 21 #define MTP_GPI_IS 0x200 22 22 #define MTP_GPI_IE 0x220 23 23 24 - #define MTP_GPP(r, s, e, g) \ 25 - { \ 26 - .reg_num = (r), \ 27 - .base = (s), \ 28 - .size = ((e) - (s) + 1), \ 29 - .gpio_base = (g), \ 30 - } 31 - 32 24 #define MTP_COMMUNITY(b, s, e, g) \ 33 25 INTEL_COMMUNITY_GPPS(b, s, e, g, MTP) 34 26 ··· 387 395 }; 388 396 389 397 static const struct intel_padgroup mtps_community0_gpps[] = { 390 - MTP_GPP(0, 0, 24, 0), /* GPP_D */ 391 - MTP_GPP(1, 25, 38, 32), /* GPP_R */ 392 - MTP_GPP(2, 39, 56, 64), /* GPP_J */ 393 - MTP_GPP(3, 57, 87, 96), /* vGPIO */ 398 + INTEL_GPP(0, 0, 24, 0), /* GPP_D */ 399 + INTEL_GPP(1, 25, 38, 32), /* GPP_R */ 400 + INTEL_GPP(2, 39, 56, 64), /* GPP_J */ 401 + INTEL_GPP(3, 57, 87, 96), /* vGPIO */ 394 402 }; 395 403 396 404 static const struct intel_padgroup mtps_community1_gpps[] = { 397 - MTP_GPP(0, 88, 102, 128), /* GPP_A */ 398 - MTP_GPP(1, 103, 114, 160), /* DIR_ESPI */ 399 - MTP_GPP(2, 115, 136, 192), /* GPP_B */ 405 + INTEL_GPP(0, 88, 102, 128), /* GPP_A */ 406 + INTEL_GPP(1, 103, 114, 160), /* DIR_ESPI */ 407 + INTEL_GPP(2, 115, 136, 192), /* GPP_B */ 400 408 }; 401 409 402 410 static const struct intel_padgroup mtps_community3_gpps[] = { 403 - MTP_GPP(0, 137, 145, 224), /* SPI0 */ 404 - MTP_GPP(1, 146, 169, 256), /* GPP_C */ 405 - MTP_GPP(2, 170, 189, 288), /* GPP_H */ 406 - MTP_GPP(3, 190, 193, 320), /* vGPIO_3 */ 407 - MTP_GPP(4, 194, 201, 352), /* vGPIO_0 */ 408 - MTP_GPP(5, 202, 232, 384), /* vGPIO_4 */ 411 + INTEL_GPP(0, 137, 145, 224), /* SPI0 */ 412 + INTEL_GPP(1, 146, 169, 256), /* GPP_C */ 413 + INTEL_GPP(2, 170, 189, 288), /* GPP_H */ 414 + INTEL_GPP(3, 190, 193, 320), /* vGPIO_3 */ 415 + INTEL_GPP(4, 194, 201, 352), /* vGPIO_0 */ 416 + INTEL_GPP(5, 202, 232, 384), /* vGPIO_4 */ 409 417 }; 410 418 411 419 static const struct intel_padgroup mtps_community4_gpps[] = { 412 - MTP_GPP(0, 233, 240, 416), /* GPP_S */ 413 - MTP_GPP(1, 241, 263, 448), /* GPP_E */ 414 - MTP_GPP(2, 264, 277, 480), /* GPP_K */ 415 - MTP_GPP(3, 278, 301, 512), /* GPP_F */ 420 + INTEL_GPP(0, 233, 240, 416), /* GPP_S */ 421 + INTEL_GPP(1, 241, 263, 448), /* GPP_E */ 422 + INTEL_GPP(2, 264, 277, 480), /* GPP_K */ 423 + INTEL_GPP(3, 278, 301, 512), /* GPP_F */ 416 424 }; 417 425 418 426 static const struct intel_padgroup mtps_community5_gpps[] = { 419 - MTP_GPP(0, 302, 322, 544), /* GPP_I */ 420 - MTP_GPP(1, 323, 338, 576), /* JTAG_CPU */ 427 + INTEL_GPP(0, 302, 322, 544), /* GPP_I */ 428 + INTEL_GPP(1, 323, 338, 576), /* JTAG_CPU */ 421 429 }; 422 430 423 431 static const struct intel_community mtps_communities[] = {
+9 -17
drivers/pinctrl/intel/pinctrl-sunrisepoint.c
··· 28 28 #define SPT_LP_GPI_IS 0x100 29 29 #define SPT_LP_GPI_IE 0x120 30 30 31 - #define SPT_H_GPP(r, s, e, g) \ 32 - { \ 33 - .reg_num = (r), \ 34 - .base = (s), \ 35 - .size = ((e) - (s) + 1), \ 36 - .gpio_base = (g), \ 37 - } 38 - 39 31 #define SPT_H_COMMUNITY(b, s, e, g) \ 40 32 INTEL_COMMUNITY_GPPS(b, s, e, g, SPT_H) 41 33 ··· 530 538 }; 531 539 532 540 static const struct intel_padgroup spth_community0_gpps[] = { 533 - SPT_H_GPP(0, 0, 23, 0), /* GPP_A */ 534 - SPT_H_GPP(1, 24, 47, 24), /* GPP_B */ 541 + INTEL_GPP(0, 0, 23, 0), /* GPP_A */ 542 + INTEL_GPP(1, 24, 47, 24), /* GPP_B */ 535 543 }; 536 544 537 545 static const struct intel_padgroup spth_community1_gpps[] = { 538 - SPT_H_GPP(0, 48, 71, 48), /* GPP_C */ 539 - SPT_H_GPP(1, 72, 95, 72), /* GPP_D */ 540 - SPT_H_GPP(2, 96, 108, 96), /* GPP_E */ 541 - SPT_H_GPP(3, 109, 132, 120), /* GPP_F */ 542 - SPT_H_GPP(4, 133, 156, 144), /* GPP_G */ 543 - SPT_H_GPP(5, 157, 180, 168), /* GPP_H */ 546 + INTEL_GPP(0, 48, 71, 48), /* GPP_C */ 547 + INTEL_GPP(1, 72, 95, 72), /* GPP_D */ 548 + INTEL_GPP(2, 96, 108, 96), /* GPP_E */ 549 + INTEL_GPP(3, 109, 132, 120), /* GPP_F */ 550 + INTEL_GPP(4, 133, 156, 144), /* GPP_G */ 551 + INTEL_GPP(5, 157, 180, 168), /* GPP_H */ 544 552 }; 545 553 546 554 static const struct intel_padgroup spth_community3_gpps[] = { 547 - SPT_H_GPP(0, 181, 191, 192), /* GPP_I */ 555 + INTEL_GPP(0, 181, 191, 192), /* GPP_I */ 548 556 }; 549 557 550 558 static const struct intel_community spth_communities[] = {
+31 -39
drivers/pinctrl/intel/pinctrl-tigerlake.c
··· 28 28 #define TGL_H_GPI_IS 0x100 29 29 #define TGL_H_GPI_IE 0x120 30 30 31 - #define TGL_GPP(r, s, e, g) \ 32 - { \ 33 - .reg_num = (r), \ 34 - .base = (s), \ 35 - .size = ((e) - (s) + 1), \ 36 - .gpio_base = (g), \ 37 - } 38 - 39 31 #define TGL_LP_COMMUNITY(b, s, e, g) \ 40 32 INTEL_COMMUNITY_GPPS(b, s, e, g, TGL_LP) 41 33 ··· 331 339 }; 332 340 333 341 static const struct intel_padgroup tgllp_community0_gpps[] = { 334 - TGL_GPP(0, 0, 25, 0), /* GPP_B */ 335 - TGL_GPP(1, 26, 41, 32), /* GPP_T */ 336 - TGL_GPP(2, 42, 66, 64), /* GPP_A */ 342 + INTEL_GPP(0, 0, 25, 0), /* GPP_B */ 343 + INTEL_GPP(1, 26, 41, 32), /* GPP_T */ 344 + INTEL_GPP(2, 42, 66, 64), /* GPP_A */ 337 345 }; 338 346 339 347 static const struct intel_padgroup tgllp_community1_gpps[] = { 340 - TGL_GPP(0, 67, 74, 96), /* GPP_S */ 341 - TGL_GPP(1, 75, 98, 128), /* GPP_H */ 342 - TGL_GPP(2, 99, 119, 160), /* GPP_D */ 343 - TGL_GPP(3, 120, 143, 192), /* GPP_U */ 344 - TGL_GPP(4, 144, 170, 224), /* vGPIO */ 348 + INTEL_GPP(0, 67, 74, 96), /* GPP_S */ 349 + INTEL_GPP(1, 75, 98, 128), /* GPP_H */ 350 + INTEL_GPP(2, 99, 119, 160), /* GPP_D */ 351 + INTEL_GPP(3, 120, 143, 192), /* GPP_U */ 352 + INTEL_GPP(4, 144, 170, 224), /* vGPIO */ 345 353 }; 346 354 347 355 static const struct intel_padgroup tgllp_community4_gpps[] = { 348 - TGL_GPP(0, 171, 194, 256), /* GPP_C */ 349 - TGL_GPP(1, 195, 219, 288), /* GPP_F */ 350 - TGL_GPP(2, 220, 225, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 351 - TGL_GPP(3, 226, 250, 320), /* GPP_E */ 352 - TGL_GPP(4, 251, 259, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 356 + INTEL_GPP(0, 171, 194, 256), /* GPP_C */ 357 + INTEL_GPP(1, 195, 219, 288), /* GPP_F */ 358 + INTEL_GPP(2, 220, 225, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 359 + INTEL_GPP(3, 226, 250, 320), /* GPP_E */ 360 + INTEL_GPP(4, 251, 259, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 353 361 }; 354 362 355 363 static const struct intel_padgroup tgllp_community5_gpps[] = { 356 - TGL_GPP(0, 260, 267, 352), /* GPP_R */ 357 - TGL_GPP(1, 268, 276, INTEL_GPIO_BASE_NOMAP), /* SPI */ 364 + INTEL_GPP(0, 260, 267, 352), /* GPP_R */ 365 + INTEL_GPP(1, 268, 276, INTEL_GPIO_BASE_NOMAP), /* SPI */ 358 366 }; 359 367 360 368 static const struct intel_community tgllp_communities[] = { ··· 683 691 }; 684 692 685 693 static const struct intel_padgroup tglh_community0_gpps[] = { 686 - TGL_GPP(0, 0, 24, 0), /* GPP_A */ 687 - TGL_GPP(1, 25, 44, 32), /* GPP_R */ 688 - TGL_GPP(2, 45, 70, 64), /* GPP_B */ 689 - TGL_GPP(3, 71, 78, 96), /* vGPIO_0 */ 694 + INTEL_GPP(0, 0, 24, 0), /* GPP_A */ 695 + INTEL_GPP(1, 25, 44, 32), /* GPP_R */ 696 + INTEL_GPP(2, 45, 70, 64), /* GPP_B */ 697 + INTEL_GPP(3, 71, 78, 96), /* vGPIO_0 */ 690 698 }; 691 699 692 700 static const struct intel_padgroup tglh_community1_gpps[] = { 693 - TGL_GPP(0, 79, 104, 128), /* GPP_D */ 694 - TGL_GPP(1, 105, 128, 160), /* GPP_C */ 695 - TGL_GPP(2, 129, 136, 192), /* GPP_S */ 696 - TGL_GPP(3, 137, 153, 224), /* GPP_G */ 697 - TGL_GPP(4, 154, 180, 256), /* vGPIO */ 701 + INTEL_GPP(0, 79, 104, 128), /* GPP_D */ 702 + INTEL_GPP(1, 105, 128, 160), /* GPP_C */ 703 + INTEL_GPP(2, 129, 136, 192), /* GPP_S */ 704 + INTEL_GPP(3, 137, 153, 224), /* GPP_G */ 705 + INTEL_GPP(4, 154, 180, 256), /* vGPIO */ 698 706 }; 699 707 700 708 static const struct intel_padgroup tglh_community3_gpps[] = { 701 - TGL_GPP(0, 181, 193, 288), /* GPP_E */ 702 - TGL_GPP(1, 194, 217, 320), /* GPP_F */ 709 + INTEL_GPP(0, 181, 193, 288), /* GPP_E */ 710 + INTEL_GPP(1, 194, 217, 320), /* GPP_F */ 703 711 }; 704 712 705 713 static const struct intel_padgroup tglh_community4_gpps[] = { 706 - TGL_GPP(0, 218, 241, 352), /* GPP_H */ 707 - TGL_GPP(1, 242, 251, 384), /* GPP_J */ 708 - TGL_GPP(2, 252, 266, 416), /* GPP_K */ 714 + INTEL_GPP(0, 218, 241, 352), /* GPP_H */ 715 + INTEL_GPP(1, 242, 251, 384), /* GPP_J */ 716 + INTEL_GPP(2, 252, 266, 416), /* GPP_K */ 709 717 }; 710 718 711 719 static const struct intel_padgroup tglh_community5_gpps[] = { 712 - TGL_GPP(0, 267, 281, 448), /* GPP_I */ 713 - TGL_GPP(1, 282, 290, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 720 + INTEL_GPP(0, 267, 281, 448), /* GPP_I */ 721 + INTEL_GPP(1, 282, 290, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 714 722 }; 715 723 716 724 static const struct intel_community tglh_communities[] = {