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

pinctrl: cherryview: 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>

+20 -26
+20 -26
drivers/pinctrl/intel/pinctrl-cherryview.c
··· 92 92 93 93 #define PINMODE(m, i) ((m) | ((i) * PINMODE_INVERT_OE)) 94 94 95 - #define CHV_GPP(start, end) \ 96 - { \ 97 - .base = (start), \ 98 - .size = (end) - (start) + 1, \ 99 - } 100 - 101 95 #define CHV_COMMUNITY(g, i, a) \ 102 96 { \ 103 97 .gpps = (g), \ ··· 252 258 }; 253 259 254 260 static const struct intel_padgroup southwest_gpps[] = { 255 - CHV_GPP(0, 7), 256 - CHV_GPP(15, 22), 257 - CHV_GPP(30, 37), 258 - CHV_GPP(45, 52), 259 - CHV_GPP(60, 67), 260 - CHV_GPP(75, 82), 261 - CHV_GPP(90, 97), 261 + INTEL_GPP(0, 0, 7, 0), 262 + INTEL_GPP(1, 15, 22, 15), 263 + INTEL_GPP(2, 30, 37, 30), 264 + INTEL_GPP(3, 45, 52, 45), 265 + INTEL_GPP(4, 60, 67, 60), 266 + INTEL_GPP(5, 75, 82, 75), 267 + INTEL_GPP(6, 90, 97, 90), 262 268 }; 263 269 264 270 /* ··· 348 354 }; 349 355 350 356 static const struct intel_padgroup north_gpps[] = { 351 - CHV_GPP(0, 8), 352 - CHV_GPP(15, 27), 353 - CHV_GPP(30, 41), 354 - CHV_GPP(45, 56), 355 - CHV_GPP(60, 72), 357 + INTEL_GPP(0, 0, 8, 0), 358 + INTEL_GPP(1, 15, 27, 15), 359 + INTEL_GPP(2, 30, 41, 30), 360 + INTEL_GPP(3, 45, 56, 45), 361 + INTEL_GPP(4, 60, 72, 60), 356 362 }; 357 363 358 364 /* ··· 400 406 }; 401 407 402 408 static const struct intel_padgroup east_gpps[] = { 403 - CHV_GPP(0, 11), 404 - CHV_GPP(15, 26), 409 + INTEL_GPP(0, 0, 11, 0), 410 + INTEL_GPP(1, 15, 26, 15), 405 411 }; 406 412 407 413 static const struct intel_community east_communities[] = { ··· 520 526 }; 521 527 522 528 static const struct intel_padgroup southeast_gpps[] = { 523 - CHV_GPP(0, 7), 524 - CHV_GPP(15, 26), 525 - CHV_GPP(30, 35), 526 - CHV_GPP(45, 52), 527 - CHV_GPP(60, 69), 528 - CHV_GPP(75, 85), 529 + INTEL_GPP(0, 0, 7, 0), 530 + INTEL_GPP(1, 15, 26, 15), 531 + INTEL_GPP(2, 30, 35, 30), 532 + INTEL_GPP(3, 45, 52, 45), 533 + INTEL_GPP(4, 60, 69, 60), 534 + INTEL_GPP(5, 75, 85, 75), 529 535 }; 530 536 531 537 static const struct intel_community southeast_communities[] = {