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

pinctrl: elkhartlake: Switch to INTEL_GPP() macro

Replace custom macro with the recently defined INTEL_GPP().

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

+18 -25
+18 -25
drivers/pinctrl/intel/pinctrl-elkhartlake.c
··· 21 21 #define EHL_GPI_IS 0x100 22 22 #define EHL_GPI_IE 0x120 23 23 24 - #define EHL_GPP(r, s, e) \ 25 - { \ 26 - .reg_num = (r), \ 27 - .base = (s), \ 28 - .size = ((e) - (s) + 1), \ 29 - } 30 - 31 24 #define EHL_COMMUNITY(b, s, e, g) \ 32 25 INTEL_COMMUNITY_GPPS(b, s, e, g, EHL) 33 26 ··· 99 106 }; 100 107 101 108 static const struct intel_padgroup ehl_community0_gpps[] = { 102 - EHL_GPP(0, 0, 25), /* GPP_B */ 103 - EHL_GPP(1, 26, 41), /* GPP_T */ 104 - EHL_GPP(2, 42, 66), /* GPP_G */ 109 + INTEL_GPP(0, 0, 25, 0), /* GPP_B */ 110 + INTEL_GPP(1, 26, 41, 26), /* GPP_T */ 111 + INTEL_GPP(2, 42, 66, 42), /* GPP_G */ 105 112 }; 106 113 107 114 static const struct intel_community ehl_community0[] = { ··· 238 245 }; 239 246 240 247 static const struct intel_padgroup ehl_community1_gpps[] = { 241 - EHL_GPP(0, 0, 15), /* GPP_V */ 242 - EHL_GPP(1, 16, 39), /* GPP_H */ 243 - EHL_GPP(2, 40, 60), /* GPP_D */ 244 - EHL_GPP(3, 61, 84), /* GPP_U */ 245 - EHL_GPP(4, 85, 112), /* vGPIO */ 248 + INTEL_GPP(0, 0, 15, 0), /* GPP_V */ 249 + INTEL_GPP(1, 16, 39, 16), /* GPP_H */ 250 + INTEL_GPP(2, 40, 60, 40), /* GPP_D */ 251 + INTEL_GPP(3, 61, 84, 61), /* GPP_U */ 252 + INTEL_GPP(4, 85, 112, 85), /* vGPIO */ 246 253 }; 247 254 248 255 static const struct intel_community ehl_community1[] = { ··· 279 286 }; 280 287 281 288 static const struct intel_padgroup ehl_community2_gpps[] = { 282 - EHL_GPP(0, 0, 16), /* DSW */ 289 + INTEL_GPP(0, 0, 16, 0), /* DSW */ 283 290 }; 284 291 285 292 static const struct intel_community ehl_community2[] = { ··· 349 356 }; 350 357 351 358 static const struct intel_padgroup ehl_community3_gpps[] = { 352 - EHL_GPP(0, 0, 16), /* CPU */ 353 - EHL_GPP(1, 17, 18), /* GPP_S */ 354 - EHL_GPP(2, 19, 42), /* GPP_A */ 355 - EHL_GPP(3, 43, 46), /* vGPIO_3 */ 359 + INTEL_GPP(0, 0, 16, 0), /* CPU */ 360 + INTEL_GPP(1, 17, 18, 17), /* GPP_S */ 361 + INTEL_GPP(2, 19, 42, 19), /* GPP_A */ 362 + INTEL_GPP(3, 43, 46, 43), /* vGPIO_3 */ 356 363 }; 357 364 358 365 static const struct intel_community ehl_community3[] = { ··· 455 462 }; 456 463 457 464 static const struct intel_padgroup ehl_community4_gpps[] = { 458 - EHL_GPP(0, 0, 23), /* GPP_C */ 459 - EHL_GPP(1, 24, 48), /* GPP_F */ 460 - EHL_GPP(2, 49, 54), /* HVCMOS */ 461 - EHL_GPP(3, 55, 79), /* GPP_E */ 465 + INTEL_GPP(0, 0, 23, 0), /* GPP_C */ 466 + INTEL_GPP(1, 24, 48, 24), /* GPP_F */ 467 + INTEL_GPP(2, 49, 54, 49), /* HVCMOS */ 468 + INTEL_GPP(3, 55, 79, 55), /* GPP_E */ 462 469 }; 463 470 464 471 static const struct intel_community ehl_community4[] = { ··· 486 493 }; 487 494 488 495 static const struct intel_padgroup ehl_community5_gpps[] = { 489 - EHL_GPP(0, 0, 7), /* GPP_R */ 496 + INTEL_GPP(0, 0, 7, 0), /* GPP_R */ 490 497 }; 491 498 492 499 static const struct intel_community ehl_community5[] = {