Skip to content

Commit 9151857

Browse files
committed
pinctrl: meteorpoint: Switch to INTEL_GPP() macro
Replace custom macro with the recently defined INTEL_GPP(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent cac89a3 commit 9151857

1 file changed

Lines changed: 19 additions & 27 deletions

File tree

drivers/pinctrl/intel/pinctrl-meteorpoint.c

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
#define MTP_GPI_IS 0x200
2222
#define MTP_GPI_IE 0x220
2323

24-
#define MTP_GPP(r, s, e, g) \
25-
{ \
26-
.reg_num = (r), \
27-
.base = (s), \
28-
.size = ((e) - (s) + 1), \
29-
.gpio_base = (g), \
30-
}
31-
3224
#define MTP_COMMUNITY(b, s, e, g) \
3325
INTEL_COMMUNITY_GPPS(b, s, e, g, MTP)
3426

@@ -395,37 +387,37 @@ static const struct pinctrl_pin_desc mtps_pins[] = {
395387
};
396388

397389
static const struct intel_padgroup mtps_community0_gpps[] = {
398-
MTP_GPP(0, 0, 24, 0), /* GPP_D */
399-
MTP_GPP(1, 25, 38, 32), /* GPP_R */
400-
MTP_GPP(2, 39, 56, 64), /* GPP_J */
401-
MTP_GPP(3, 57, 87, 96), /* vGPIO */
390+
INTEL_GPP(0, 0, 24, 0), /* GPP_D */
391+
INTEL_GPP(1, 25, 38, 32), /* GPP_R */
392+
INTEL_GPP(2, 39, 56, 64), /* GPP_J */
393+
INTEL_GPP(3, 57, 87, 96), /* vGPIO */
402394
};
403395

404396
static const struct intel_padgroup mtps_community1_gpps[] = {
405-
MTP_GPP(0, 88, 102, 128), /* GPP_A */
406-
MTP_GPP(1, 103, 114, 160), /* DIR_ESPI */
407-
MTP_GPP(2, 115, 136, 192), /* GPP_B */
397+
INTEL_GPP(0, 88, 102, 128), /* GPP_A */
398+
INTEL_GPP(1, 103, 114, 160), /* DIR_ESPI */
399+
INTEL_GPP(2, 115, 136, 192), /* GPP_B */
408400
};
409401

410402
static const struct intel_padgroup mtps_community3_gpps[] = {
411-
MTP_GPP(0, 137, 145, 224), /* SPI0 */
412-
MTP_GPP(1, 146, 169, 256), /* GPP_C */
413-
MTP_GPP(2, 170, 189, 288), /* GPP_H */
414-
MTP_GPP(3, 190, 193, 320), /* vGPIO_3 */
415-
MTP_GPP(4, 194, 201, 352), /* vGPIO_0 */
416-
MTP_GPP(5, 202, 232, 384), /* vGPIO_4 */
403+
INTEL_GPP(0, 137, 145, 224), /* SPI0 */
404+
INTEL_GPP(1, 146, 169, 256), /* GPP_C */
405+
INTEL_GPP(2, 170, 189, 288), /* GPP_H */
406+
INTEL_GPP(3, 190, 193, 320), /* vGPIO_3 */
407+
INTEL_GPP(4, 194, 201, 352), /* vGPIO_0 */
408+
INTEL_GPP(5, 202, 232, 384), /* vGPIO_4 */
417409
};
418410

419411
static const struct intel_padgroup mtps_community4_gpps[] = {
420-
MTP_GPP(0, 233, 240, 416), /* GPP_S */
421-
MTP_GPP(1, 241, 263, 448), /* GPP_E */
422-
MTP_GPP(2, 264, 277, 480), /* GPP_K */
423-
MTP_GPP(3, 278, 301, 512), /* GPP_F */
412+
INTEL_GPP(0, 233, 240, 416), /* GPP_S */
413+
INTEL_GPP(1, 241, 263, 448), /* GPP_E */
414+
INTEL_GPP(2, 264, 277, 480), /* GPP_K */
415+
INTEL_GPP(3, 278, 301, 512), /* GPP_F */
424416
};
425417

426418
static const struct intel_padgroup mtps_community5_gpps[] = {
427-
MTP_GPP(0, 302, 322, 544), /* GPP_I */
428-
MTP_GPP(1, 323, 338, 576), /* JTAG_CPU */
419+
INTEL_GPP(0, 302, 322, 544), /* GPP_I */
420+
INTEL_GPP(1, 323, 338, 576), /* JTAG_CPU */
429421
};
430422

431423
static const struct intel_community mtps_communities[] = {

0 commit comments

Comments
 (0)