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

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

+13 -20
+13 -20
drivers/pinctrl/intel/pinctrl-emmitsburg.c
··· 21 21 #define EBG_GPI_IS 0x200 22 22 #define EBG_GPI_IE 0x210 23 23 24 - #define EBG_GPP(r, s, e) \ 25 - { \ 26 - .reg_num = (r), \ 27 - .base = (s), \ 28 - .size = ((e) - (s) + 1), \ 29 - } 30 - 31 24 #define EBG_COMMUNITY(b, s, e, g) \ 32 25 INTEL_COMMUNITY_GPPS(b, s, e, g, EBG) 33 26 ··· 304 311 }; 305 312 306 313 static const struct intel_padgroup ebg_community0_gpps[] = { 307 - EBG_GPP(0, 0, 20), /* GPP_A */ 308 - EBG_GPP(1, 21, 44), /* GPP_B */ 309 - EBG_GPP(2, 45, 65), /* SPI */ 314 + INTEL_GPP(0, 0, 20, 0), /* GPP_A */ 315 + INTEL_GPP(1, 21, 44, 21), /* GPP_B */ 316 + INTEL_GPP(2, 45, 65, 45), /* SPI */ 310 317 }; 311 318 312 319 static const struct intel_padgroup ebg_community1_gpps[] = { 313 - EBG_GPP(0, 66, 87), /* GPP_C */ 314 - EBG_GPP(1, 88, 111), /* GPP_D */ 320 + INTEL_GPP(0, 66, 87, 66), /* GPP_C */ 321 + INTEL_GPP(1, 88, 111, 88), /* GPP_D */ 315 322 }; 316 323 317 324 static const struct intel_padgroup ebg_community3_gpps[] = { 318 - EBG_GPP(0, 112, 135), /* GPP_E */ 319 - EBG_GPP(1, 136, 145), /* JTAG */ 325 + INTEL_GPP(0, 112, 135, 112), /* GPP_E */ 326 + INTEL_GPP(1, 136, 145, 136), /* JTAG */ 320 327 }; 321 328 322 329 static const struct intel_padgroup ebg_community4_gpps[] = { 323 - EBG_GPP(0, 146, 165), /* GPP_H */ 324 - EBG_GPP(1, 166, 183), /* GPP_J */ 330 + INTEL_GPP(0, 146, 165, 146), /* GPP_H */ 331 + INTEL_GPP(1, 166, 183, 166), /* GPP_J */ 325 332 }; 326 333 327 334 static const struct intel_padgroup ebg_community5_gpps[] = { 328 - EBG_GPP(0, 184, 207), /* GPP_I */ 329 - EBG_GPP(1, 208, 225), /* GPP_L */ 330 - EBG_GPP(2, 226, 243), /* GPP_M */ 331 - EBG_GPP(3, 244, 261), /* GPP_N */ 335 + INTEL_GPP(0, 184, 207, 184), /* GPP_I */ 336 + INTEL_GPP(1, 208, 225, 208), /* GPP_L */ 337 + INTEL_GPP(2, 226, 243, 226), /* GPP_M */ 338 + INTEL_GPP(3, 244, 261, 244), /* GPP_N */ 332 339 }; 333 340 334 341 static const struct intel_community ebg_communities[] = {