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

pinctrl: icelake: Use generic flag for special GPIO base treatment

Since we have a generic flag for special GPIO base treatment,
use it in the driver.

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

+14 -16
+14 -16
drivers/pinctrl/intel/pinctrl-icelake.c
··· 29 29 .gpio_base = (g), \ 30 30 } 31 31 32 - #define ICL_NO_GPIO -1 33 - 34 32 #define ICL_COMMUNITY(b, s, e, g) \ 35 33 { \ 36 34 .barno = (b), \ ··· 303 305 }; 304 306 305 307 static const struct intel_padgroup icllp_community0_gpps[] = { 306 - ICL_GPP(0, 0, 7, 0), /* GPP_G */ 307 - ICL_GPP(1, 8, 33, 32), /* GPP_B */ 308 - ICL_GPP(2, 34, 58, 64), /* GPP_A */ 308 + ICL_GPP(0, 0, 7, 0), /* GPP_G */ 309 + ICL_GPP(1, 8, 33, 32), /* GPP_B */ 310 + ICL_GPP(2, 34, 58, 64), /* GPP_A */ 309 311 }; 310 312 311 313 static const struct intel_padgroup icllp_community1_gpps[] = { 312 - ICL_GPP(0, 59, 82, 96), /* GPP_H */ 313 - ICL_GPP(1, 83, 103, 128), /* GPP_D */ 314 - ICL_GPP(2, 104, 123, 160), /* GPP_F */ 315 - ICL_GPP(3, 124, 152, 192), /* vGPIO */ 314 + ICL_GPP(0, 59, 82, 96), /* GPP_H */ 315 + ICL_GPP(1, 83, 103, 128), /* GPP_D */ 316 + ICL_GPP(2, 104, 123, 160), /* GPP_F */ 317 + ICL_GPP(3, 124, 152, 192), /* vGPIO */ 316 318 }; 317 319 318 320 static const struct intel_padgroup icllp_community4_gpps[] = { 319 - ICL_GPP(0, 153, 176, 224), /* GPP_C */ 320 - ICL_GPP(1, 177, 182, ICL_NO_GPIO), /* HVCMOS */ 321 - ICL_GPP(2, 183, 206, 256), /* GPP_E */ 322 - ICL_GPP(3, 207, 215, ICL_NO_GPIO), /* JTAG */ 321 + ICL_GPP(0, 153, 176, 224), /* GPP_C */ 322 + ICL_GPP(1, 177, 182, INTEL_GPIO_BASE_NOMAP), /* HVCMOS */ 323 + ICL_GPP(2, 183, 206, 256), /* GPP_E */ 324 + ICL_GPP(3, 207, 215, INTEL_GPIO_BASE_NOMAP), /* JTAG */ 323 325 }; 324 326 325 327 static const struct intel_padgroup icllp_community5_gpps[] = { 326 - ICL_GPP(0, 216, 223, 288), /* GPP_R */ 327 - ICL_GPP(1, 224, 231, 320), /* GPP_S */ 328 - ICL_GPP(2, 232, 240, ICL_NO_GPIO), /* SPI */ 328 + ICL_GPP(0, 216, 223, 288), /* GPP_R */ 329 + ICL_GPP(1, 224, 231, 320), /* GPP_S */ 330 + ICL_GPP(2, 232, 240, INTEL_GPIO_BASE_NOMAP), /* SPI */ 329 331 }; 330 332 331 333 static const struct intel_community icllp_communities[] = {