File tree Expand file tree Collapse file tree 2 files changed +4
-28
lines changed Expand file tree Collapse file tree 2 files changed +4
-28
lines changed Original file line number Diff line number Diff line change @@ -504,17 +504,6 @@ static const int lkgpo2_pins[] = { 9 };
504
504
505
505
static const int nprd_smi_pins [] = { 190 };
506
506
507
- /*
508
- * pin: name, number
509
- * group: name, npins, pins
510
- * function: name, ngroups, groups
511
- */
512
- struct npcm7xx_group {
513
- const char * name ;
514
- const unsigned int * pins ;
515
- int npins ;
516
- };
517
-
518
507
#define NPCM7XX_GRPS \
519
508
NPCM7XX_GRP(smb0), \
520
509
NPCM7XX_GRP(smb0b), \
@@ -642,9 +631,8 @@ enum {
642
631
#undef NPCM7XX_GRP
643
632
};
644
633
645
- static struct npcm7xx_group npcm7xx_groups [] = {
646
- #define NPCM7XX_GRP (x ) { .name = #x , .pins = x ## _pins, \
647
- .npins = ARRAY_SIZE(x ## _pins) }
634
+ static struct pingroup npcm7xx_groups [] = {
635
+ #define NPCM7XX_GRP (x ) PINCTRL_PINGROUP (#x , x ## _pins, ARRAY_SIZE(x ## _pins))
648
636
NPCM7XX_GRPS
649
637
#undef NPCM7XX_GRP
650
638
};
Original file line number Diff line number Diff line change @@ -587,17 +587,6 @@ static const int hgpio5_pins[] = { 25 };
587
587
static const int hgpio6_pins [] = { 59 };
588
588
static const int hgpio7_pins [] = { 60 };
589
589
590
- /*
591
- * pin: name, number
592
- * group: name, npins, pins
593
- * function: name, ngroups, groups
594
- */
595
- struct npcm8xx_pingroup {
596
- const char * name ;
597
- const unsigned int * pins ;
598
- int npins ;
599
- };
600
-
601
590
#define NPCM8XX_GRPS \
602
591
NPCM8XX_GRP(gpi36), \
603
592
NPCM8XX_GRP(gpi35), \
@@ -829,9 +818,8 @@ enum {
829
818
#undef NPCM8XX_GRP
830
819
};
831
820
832
- static struct npcm8xx_pingroup npcm8xx_pingroups [] = {
833
- #define NPCM8XX_GRP (x ) { .name = #x , .pins = x ## _pins, \
834
- .npins = ARRAY_SIZE(x ## _pins) }
821
+ static struct pingroup npcm8xx_pingroups [] = {
822
+ #define NPCM8XX_GRP (x ) PINCTRL_PINGROUP (#x , x ## _pins, ARRAY_SIZE(x ## _pins))
835
823
NPCM8XX_GRPS
836
824
#undef NPCM8XX_GRP
837
825
};
You can’t perform that action at this time.
0 commit comments