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

pinctrl: tigerlake: Switch to INTEL_GPP() macro

Replace custom macro with the recently defined INTEL_GPP().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Andy Shevchenko ba646778 9151857e

+31 -39
+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[] = {