Fixing the compile-test warnings in pinctrl-npcm7xx
Subsystems (3)
v3 cover Fixing the compile-test warnings in pinctrl-npcm7xx
My "Nuvoton WPCM450 pinctrl and GPIO driver" patchset brought two warnings[1] in the pinctrl-npcm7xx to light.
[1]: https://lore.kernel.org/lkml/[email protected]/
v3:
- Changed to %du to %zu
v2:
- "Fixes:" tags
Jonathan Neuschäfer (2):
pinctrl: nuvoton: npcm7xx: Use %zu printk format for ARRAY_SIZE()
pinctrl: nuvoton: npcm7xx: Rename DS() macro to DSTR()
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 160 +++++++++++----------- 1 file changed, 80 insertions(+), 80 deletions(-)
--
2.34.1
PATCH v3 1/2 pinctrl: nuvoton: npcm7xx: Use %zu printk format for ARRAY_SIZE()
When compile-testing on 64-bit architectures, GCC complains about the mismatch of types between the %d format specifier and value returned by ARRAY_LENGTH(). Use %zu, which is correct everywhere.
---
v3:
- Change from %zd to %zu because we're dealing with an unsigned value
v2:
- Add Fixes and R-b tags
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +1 -1
@@ -1561,7 +1561,7 @@ static int npcm7xx_get_groups_count(struct pinctrl_dev *pctldev) {struct npcm7xx_pinctrl *npcm =pinctrl_dev_get_drvdata (pctldev); -dev_dbg (npcm->dev,"group size: %d\n" ,ARRAY_SIZE (npcm7xx_groups)); +dev_dbg (npcm->dev,"group size: %zu\n" ,ARRAY_SIZE (npcm7xx_groups));return ARRAY_SIZE (npcm7xx_groups); }
--
2.34.1
Re: [PATCH v3 1/2] pinctrl: nuvoton: npcm7xx: Use %zu printk format for ARRAY_SIZE()
Quoted 11 lines · Jonathan Neuschäfer
When compile-testing on 64-bit architectures, GCC complains about the mismatch of types between the %d format specifier and value returned by
ARRAY_LENGTH(). Use %zu, which is correct everywhere.Reported-by kernel test robot <[email protected]>Fixes 3b588e43ee5c7 ("pinctrl: nuvoton: add NPCM7xx pinctrl and GPIO driver")Signed-off-by Jonathan Neuschäfer <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>---
v3:
Applied this v3 rather than the other version.
Yours,
Linus Walleij
PATCH v3 2/2 pinctrl: nuvoton: npcm7xx: Rename DS() macro to DSTR()
In reply to Jonathan NeuschäferThe name "DS" is defined in arch/x86/um/shared/sysdep/ptrace_64.h, which results in a compiler warning when build-testing on ARCH=um. Rename this driver's "DS" macro to DSTR so avoid this collision.
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 158 +++++++++++----------- 1 file changed, 79 insertions(+), 79 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +79 -79
@@ -905,7 +905,7 @@ static struct npcm7xx_func npcm7xx_funcs[] = {#define DRIVE_STRENGTH_HI_SHIFT 12#define DRIVE_STRENGTH_MASK 0x0000FF00 -#define DS (lo, hi) (((lo) << DRIVE_STRENGTH_LO_SHIFT) | \ +#define DSTR (lo, hi) (((lo) << DRIVE_STRENGTH_LO_SHIFT) | \ ((hi) << DRIVE_STRENGTH_HI_SHIFT))#define DSLO (x) (((x) >> DRIVE_STRENGTH_LO_SHIFT) & 0xF)#define DSHI (x) (((x) >> DRIVE_STRENGTH_HI_SHIFT) & 0xF)
@@ -925,31 +925,31 @@ struct npcm7xx_pincfg {static const struct npcm7xx_pincfg pincfg[] = {/* PIN FUNCTION 1 FUNCTION 2 FUNCTION 3 FLAGS */ NPCM7XX_PINCFG (0 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (1 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (2 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (1 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (2 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (3 , iox1,MFSEL1 ,30 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (4 , iox2,MFSEL3 ,14 , smb1d,I2CSEGSEL ,7 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (5 , iox2,MFSEL3 ,14 , smb1d,I2CSEGSEL ,7 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (6 , iox2,MFSEL3 ,14 , smb2d,I2CSEGSEL ,10 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (7 , iox2,MFSEL3 ,14 , smb2d,I2CSEGSEL ,10 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (8 , lkgpo1,FLOCKR1 ,4 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (9 , lkgpo2,FLOCKR1 ,8 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (10 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (11 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (8 , lkgpo1,FLOCKR1 ,4 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (9 , lkgpo2,FLOCKR1 ,8 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (10 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (11 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (12 , gspi,MFSEL1 ,24 , smb5b,I2CSEGSEL ,19 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (13 , gspi,MFSEL1 ,24 , smb5b,I2CSEGSEL ,19 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (14 , gspi,MFSEL1 ,24 , smb5c,I2CSEGSEL ,20 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (15 , gspi,MFSEL1 ,24 , smb5c,I2CSEGSEL ,20 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (16 , lkgpo0,FLOCKR1 ,0 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (17 , pspi2,MFSEL3 ,13 , smb4den,I2CSEGSEL ,23 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (18 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (19 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (16 , lkgpo0,FLOCKR1 ,0 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (17 , pspi2,MFSEL3 ,13 , smb4den,I2CSEGSEL ,23 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (18 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (19 , pspi2,MFSEL3 ,13 , smb4b,I2CSEGSEL ,14 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (20 , smb4c,I2CSEGSEL ,15 , smb15,MFSEL3 ,8 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (21 , smb4c,I2CSEGSEL ,15 , smb15,MFSEL3 ,8 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (22 , smb4d,I2CSEGSEL ,16 , smb14,MFSEL3 ,7 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (23 , smb4d,I2CSEGSEL ,16 , smb14,MFSEL3 ,7 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (24 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (25 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (24 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (25 , ioxh,MFSEL3 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (26 , smb5,MFSEL1 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (27 , smb5,MFSEL1 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (28 , smb4,MFSEL1 ,1 , none,NONE ,0 , none,NONE ,0 ,0 ),
@@ -965,12 +965,12 @@ static const struct npcm7xx_pincfg pincfg[] = {NPCM7XX_PINCFG (39 , smb3b,I2CSEGSEL ,11 , none,NONE ,0 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (40 , smb3b,I2CSEGSEL ,11 , none,NONE ,0 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (41 , bmcuart0a,MFSEL1 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (42 , bmcuart0a,MFSEL1 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 ) |GPO ), +NPCM7XX_PINCFG (42 , bmcuart0a,MFSEL1 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 ) |GPO ),NPCM7XX_PINCFG (43 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , bmcuart1,MFSEL3 ,24 ,0 ),NPCM7XX_PINCFG (44 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , bmcuart1,MFSEL3 ,24 ,0 ),NPCM7XX_PINCFG (45 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (46 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DS (2 ,8 )), -NPCM7XX_PINCFG (47 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DS (2 ,8 )), +NPCM7XX_PINCFG (46 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DSTR (2 ,8 )), +NPCM7XX_PINCFG (47 , uart1,MFSEL1 ,10 , jtag2,MFSEL4 ,0 , none,NONE ,0 ,DSTR (2 ,8 )),NPCM7XX_PINCFG (48 , uart2,MFSEL1 ,11 , bmcuart0b,MFSEL4 ,1 , none,NONE ,0 ,GPO ),NPCM7XX_PINCFG (49 , uart2,MFSEL1 ,11 , bmcuart0b,MFSEL4 ,1 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(50, uart2, MFSEL1, 11, none, NONE, 0, none, NONE, 0, 0),
@@ -980,8 +980,8 @@ static const struct npcm7xx_pincfg pincfg[] = {NPCM7XX_PINCFG (54 , uart2,MFSEL1 ,11 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (55 , uart2,MFSEL1 ,11 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (56 , r1err,MFSEL1 ,12 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (57 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), -NPCM7XX_PINCFG (58 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), +NPCM7XX_PINCFG (57 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )), +NPCM7XX_PINCFG (58 , r1md,MFSEL1 ,13 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )),NPCM7XX_PINCFG (59 , smb3d,I2CSEGSEL ,13 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (60 , smb3d,I2CSEGSEL ,13 , none,NONE ,0 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(61, uart1, MFSEL1, 10, none, NONE, 0, none, NONE, 0, GPO),
@@ -1004,19 +1004,19 @@ static const struct npcm7xx_pincfg pincfg[] = {NPCM7XX_PINCFG (77 , fanin13,MFSEL2 ,13 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (78 , fanin14,MFSEL2 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (79 , fanin15,MFSEL2 ,15 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (80 , pwm0,MFSEL2 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (81 , pwm1,MFSEL2 ,17 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (82 , pwm2,MFSEL2 ,18 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (83 , pwm3,MFSEL2 ,19 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (84 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (85 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (86 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (80 , pwm0,MFSEL2 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (81 , pwm1,MFSEL2 ,17 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (82 , pwm2,MFSEL2 ,18 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (83 , pwm3,MFSEL2 ,19 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (84 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (85 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (86 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (87 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (88 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (89 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (90 , r2err,MFSEL1 ,15 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (91 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), -NPCM7XX_PINCFG (92 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), +NPCM7XX_PINCFG (91 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )), +NPCM7XX_PINCFG (92 , r2md,MFSEL1 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )),NPCM7XX_PINCFG (93 , ga20kbc,MFSEL1 ,17 , smb5d,I2CSEGSEL ,21 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (94 , ga20kbc,MFSEL1 ,17 , smb5d,I2CSEGSEL ,21 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(95, lpc, NONE, 0, espi, MFSEL4, 8, gpio, MFSEL1, 26, 0),
@@ -1062,34 +1062,34 @@ static const struct npcm7xx_pincfg pincfg[] = {NPCM7XX_PINCFG (133 , smb10,MFSEL4 ,13 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (134 , smb11,MFSEL4 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (135 , smb11,MFSEL4 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (136 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (137 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (138 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (139 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (140 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (136 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (137 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (138 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (139 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (140 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (141 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (142 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (142 , sd1,MFSEL3 ,12 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (143 , sd1,MFSEL3 ,12 , sd1pwr,MFSEL4 ,5 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (144 , pwm4,MFSEL2 ,20 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (145 , pwm5,MFSEL2 ,21 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (146 , pwm6,MFSEL2 ,22 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (147 , pwm7,MFSEL2 ,23 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (148 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (149 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (150 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (151 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (152 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (144 , pwm4,MFSEL2 ,20 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (145 , pwm5,MFSEL2 ,21 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (146 , pwm6,MFSEL2 ,22 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (147 , pwm7,MFSEL2 ,23 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (148 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (149 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (150 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (151 , mmc8,MFSEL3 ,11 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (152 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (153 , mmcwp,FLOCKR1 ,24 , none,NONE ,0 , none,NONE ,0 ,0 ),/* Z1/A1 */ -NPCM7XX_PINCFG (154 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (154 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (155 , mmccd,MFSEL3 ,25 , mmcrst,MFSEL4 ,6 , none,NONE ,0 ,0 ),/* Z1/A1 */ -NPCM7XX_PINCFG (156 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (157 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (158 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (159 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), - -NPCM7XX_PINCFG (160 , clkout,MFSEL1 ,21 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (161 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,DS (8 ,12 )), -NPCM7XX_PINCFG (162 , serirq,NONE ,0 , gpio,MFSEL1 ,31 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (156 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (157 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (158 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (159 , mmc,MFSEL3 ,10 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), + +NPCM7XX_PINCFG (160 , clkout,MFSEL1 ,21 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (161 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (162 , serirq,NONE ,0 , gpio,MFSEL1 ,31 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (163 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,0 ),NPCM7XX_PINCFG (164 , lpc,NONE ,0 , espi,MFSEL4 ,8 , gpio,MFSEL1 ,26 ,SLEWLPC ), NPCM7XX_PINCFG(165, lpc, NONE, 0, espi, MFSEL4, 8, gpio, MFSEL1, 26, SLEWLPC),
@@ -1102,25 +1102,25 @@ static const struct npcm7xx_pincfg pincfg[] = {NPCM7XX_PINCFG (172 , smb6,MFSEL3 ,1 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (173 , smb7,MFSEL3 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (174 , smb7,MFSEL3 ,2 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (175 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (176 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (177 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (178 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (179 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (180 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (175 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (176 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (177 , pspi1,MFSEL3 ,4 , faninx,MFSEL3 ,3 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (178 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (179 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (180 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ),NPCM7XX_PINCFG (181 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (182 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (183 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (184 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (185 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (186 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (187 , spi3cs1,MFSEL4 ,17 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), -NPCM7XX_PINCFG (188 , spi3quad,MFSEL4 ,20 , spi3cs2,MFSEL4 ,18 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (189 , spi3quad,MFSEL4 ,20 , spi3cs3,MFSEL4 ,19 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (190 , gpio,FLOCKR1 ,20 , nprd_smi,NONE ,0 , none,NONE ,0 ,DS (2 ,4 )), -NPCM7XX_PINCFG (191 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )),/* XX */ - -NPCM7XX_PINCFG (192 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )),/* XX */ +NPCM7XX_PINCFG (183 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (184 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (185 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (186 , spi3,MFSEL4 ,16 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (187 , spi3cs1,MFSEL4 ,17 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )), +NPCM7XX_PINCFG (188 , spi3quad,MFSEL4 ,20 , spi3cs2,MFSEL4 ,18 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (189 , spi3quad,MFSEL4 ,20 , spi3cs3,MFSEL4 ,19 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (190 , gpio,FLOCKR1 ,20 , nprd_smi,NONE ,0 , none,NONE ,0 ,DSTR (2 ,4 )), +NPCM7XX_PINCFG (191 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),/* XX */ + +NPCM7XX_PINCFG (192 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),/* XX */ NPCM7XX_PINCFG (193 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (194 , smb0b,I2CSEGSEL ,0 , none,NONE ,0 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(195, smb0b, I2CSEGSEL, 0, none, NONE, 0, none, NONE, 0, 0),
@@ -1131,11 +1131,11 @@ static const struct npcm7xx_pincfg pincfg[] = {NPCM7XX_PINCFG (200 , r2,MFSEL1 ,14 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (201 , r1,MFSEL3 ,9 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (202 , smb0c,I2CSEGSEL ,1 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (203 , faninx,MFSEL3 ,3 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (203 , faninx,MFSEL3 ,3 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (204 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,SLEW ),NPCM7XX_PINCFG (205 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (206 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DS (4 ,8 )), -NPCM7XX_PINCFG (207 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DS (4 ,8 )), +NPCM7XX_PINCFG (206 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DSTR (4 ,8 )), +NPCM7XX_PINCFG (207 , ddc,NONE ,0 , gpio,MFSEL3 ,22 , none,NONE ,0 ,DSTR (4 ,8 )),NPCM7XX_PINCFG (208 , rg2,MFSEL4 ,24 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (209 , rg2,MFSEL4 ,24 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ), NPCM7XX_PINCFG(210, rg2, MFSEL4, 24, ddr, MFSEL3, 26, none, NONE, 0, 0),
@@ -1147,20 +1147,20 @@ static const struct npcm7xx_pincfg pincfg[] = {NPCM7XX_PINCFG (216 , rg2mdio,MFSEL4 ,23 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (217 , rg2mdio,MFSEL4 ,23 , ddr,MFSEL3 ,26 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (218 , wdog1,MFSEL3 ,19 , none,NONE ,0 , none,NONE ,0 ,0 ), -NPCM7XX_PINCFG (219 , wdog2,MFSEL3 ,20 , none,NONE ,0 , none,NONE ,0 ,DS (4 ,8 )), +NPCM7XX_PINCFG (219 , wdog2,MFSEL3 ,20 , none,NONE ,0 , none,NONE ,0 ,DSTR (4 ,8 )),NPCM7XX_PINCFG (220 , smb12,MFSEL3 ,5 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (221 , smb12,MFSEL3 ,5 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (222 , smb13,MFSEL3 ,6 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (223 , smb13,MFSEL3 ,6 , none,NONE ,0 , none,NONE ,0 ,0 ),NPCM7XX_PINCFG (224 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,SLEW ), -NPCM7XX_PINCFG (225 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (226 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW |GPO ), -NPCM7XX_PINCFG (227 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (228 , spixcs1,MFSEL4 ,28 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (229 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (230 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 ) |SLEW ), -NPCM7XX_PINCFG (231 , clkreq,MFSEL4 ,9 , none,NONE ,0 , none,NONE ,0 ,DS (8 ,12 )), +NPCM7XX_PINCFG (225 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (226 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW |GPO ), +NPCM7XX_PINCFG (227 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (228 , spixcs1,MFSEL4 ,28 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (229 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (230 , spix,MFSEL4 ,27 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 ) |SLEW ), +NPCM7XX_PINCFG (231 , clkreq,MFSEL4 ,9 , none,NONE ,0 , none,NONE ,0 ,DSTR (8 ,12 )),NPCM7XX_PINCFG (253 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,GPI ),/* SDHC1 power */ NPCM7XX_PINCFG (254 , none,NONE ,0 , none,NONE ,0 , none,NONE ,0 ,GPI ),/* SDHC2 power */ NPCM7XX_PINCFG(255, none, NONE, 0, none, NONE, 0, none, NONE, 0, GPI), /* DACOSEL */
--
2.34.1