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

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

+15 -22
+15 -22
drivers/pinctrl/intel/pinctrl-cedarfork.c
··· 21 21 #define CDF_GPI_IS 0x200 22 22 #define CDF_GPI_IE 0x230 23 23 24 - #define CDF_GPP(r, s, e) \ 25 - { \ 26 - .reg_num = (r), \ 27 - .base = (s), \ 28 - .size = ((e) - (s) + 1), \ 29 - } 30 - 31 24 #define CDF_COMMUNITY(b, s, e, g) \ 32 25 INTEL_COMMUNITY_GPPS(b, s, e, g, CDF) 33 26 ··· 281 288 }; 282 289 283 290 static const struct intel_padgroup cdf_community0_gpps[] = { 284 - CDF_GPP(0, 0, 23), /* WEST2 */ 285 - CDF_GPP(1, 24, 47), /* WEST3 */ 286 - CDF_GPP(2, 48, 70), /* WEST01 */ 287 - CDF_GPP(3, 71, 90), /* WEST5 */ 288 - CDF_GPP(4, 91, 96), /* WESTC */ 289 - CDF_GPP(5, 97, 101), /* WESTC_DFX */ 290 - CDF_GPP(6, 102, 111), /* WESTA */ 291 - CDF_GPP(7, 112, 123), /* WESTB */ 292 - CDF_GPP(8, 124, 143), /* WESTD */ 293 - CDF_GPP(9, 144, 144), /* WESTD_PECI */ 294 - CDF_GPP(10, 145, 167), /* WESTF */ 291 + INTEL_GPP(0, 0, 23, 0), /* WEST2 */ 292 + INTEL_GPP(1, 24, 47, 24), /* WEST3 */ 293 + INTEL_GPP(2, 48, 70, 48), /* WEST01 */ 294 + INTEL_GPP(3, 71, 90, 71), /* WEST5 */ 295 + INTEL_GPP(4, 91, 96, 91), /* WESTC */ 296 + INTEL_GPP(5, 97, 101, 97), /* WESTC_DFX */ 297 + INTEL_GPP(6, 102, 111, 102), /* WESTA */ 298 + INTEL_GPP(7, 112, 123, 112), /* WESTB */ 299 + INTEL_GPP(8, 124, 143, 124), /* WESTD */ 300 + INTEL_GPP(9, 144, 144, 144), /* WESTD_PECI */ 301 + INTEL_GPP(10, 145, 167, 145), /* WESTF */ 295 302 }; 296 303 297 304 static const struct intel_padgroup cdf_community1_gpps[] = { 298 - CDF_GPP(0, 168, 191), /* EAST2 */ 299 - CDF_GPP(1, 192, 202), /* EAST3 */ 300 - CDF_GPP(2, 203, 225), /* EAST0 */ 301 - CDF_GPP(3, 226, 236), /* EMMC */ 305 + INTEL_GPP(0, 168, 191, 168), /* EAST2 */ 306 + INTEL_GPP(1, 192, 202, 192), /* EAST3 */ 307 + INTEL_GPP(2, 203, 225, 203), /* EAST0 */ 308 + INTEL_GPP(3, 226, 236, 226), /* EMMC */ 302 309 }; 303 310 304 311 static const struct intel_community cdf_communities[] = {