<div dir="ltr"><div>Sorry, forgot to add it this patch already approved.</div><div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 13 Jan 2021 at 22:00, Tomer Maimon <<a href="mailto:tmaimon77@gmail.com" target="_blank">tmaimon77@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Signed-off-by: Tomer Maimon <<a href="mailto:tmaimon77@gmail.com" target="_blank">tmaimon77@gmail.com</a>> </blockquote><div> </div><div>Reviewed-by: Joel Stanley <<a href="mailto:joel@jms.id.au" target="_blank">joel@jms.id.au</a>> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
---<br>
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 65 +++++++++++++++++------<br>
1 file changed, 49 insertions(+), 16 deletions(-)<br>
<br>
diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c<br>
index a935065cdac4..e5f58ea89917 100644<br>
--- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c<br>
+++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c<br>
@@ -504,6 +504,15 @@ static const int lkgpo2_pins[] = { 9 };<br>
<br>
static const int nprd_smi_pins[] = { 190 };<br>
<br>
+static const int hgpio0_pins[] = { 20 };<br>
+static const int hgpio1_pins[] = { 21 };<br>
+static const int hgpio2_pins[] = { 22 };<br>
+static const int hgpio3_pins[] = { 23 };<br>
+static const int hgpio4_pins[] = { 24 };<br>
+static const int hgpio5_pins[] = { 25 };<br>
+static const int hgpio6_pins[] = { 59 };<br>
+static const int hgpio7_pins[] = { 60 };<br>
+<br>
/*<br>
* pin: name, number<br>
* group: name, npins, pins<br>
@@ -631,6 +640,14 @@ struct npcm7xx_group {<br>
NPCM7XX_GRP(lkgpo1), \<br>
NPCM7XX_GRP(lkgpo2), \<br>
NPCM7XX_GRP(nprd_smi), \<br>
+ NPCM7XX_GRP(hgpio0), \<br>
+ NPCM7XX_GRP(hgpio1), \<br>
+ NPCM7XX_GRP(hgpio2), \<br>
+ NPCM7XX_GRP(hgpio3), \<br>
+ NPCM7XX_GRP(hgpio4), \<br>
+ NPCM7XX_GRP(hgpio5), \<br>
+ NPCM7XX_GRP(hgpio6), \<br>
+ NPCM7XX_GRP(hgpio7), \<br>
\<br>
<br>
enum {<br>
@@ -774,6 +791,14 @@ NPCM7XX_SFUNC(lkgpo0);<br>
NPCM7XX_SFUNC(lkgpo1);<br>
NPCM7XX_SFUNC(lkgpo2);<br>
NPCM7XX_SFUNC(nprd_smi);<br>
+NPCM7XX_SFUNC(hgpio0);<br>
+NPCM7XX_SFUNC(hgpio1);<br>
+NPCM7XX_SFUNC(hgpio2);<br>
+NPCM7XX_SFUNC(hgpio3);<br>
+NPCM7XX_SFUNC(hgpio4);<br>
+NPCM7XX_SFUNC(hgpio5);<br>
+NPCM7XX_SFUNC(hgpio6);<br>
+NPCM7XX_SFUNC(hgpio7);<br>
<br>
/* Function names */<br>
static struct npcm7xx_func npcm7xx_funcs[] = {<br>
@@ -892,6 +917,14 @@ static struct npcm7xx_func npcm7xx_funcs[] = {<br>
NPCM7XX_MKFUNC(lkgpo1),<br>
NPCM7XX_MKFUNC(lkgpo2),<br>
NPCM7XX_MKFUNC(nprd_smi),<br>
+ NPCM7XX_MKFUNC(hgpio0),<br>
+ NPCM7XX_MKFUNC(hgpio1),<br>
+ NPCM7XX_MKFUNC(hgpio2),<br>
+ NPCM7XX_MKFUNC(hgpio3),<br>
+ NPCM7XX_MKFUNC(hgpio4),<br>
+ NPCM7XX_MKFUNC(hgpio5),<br>
+ NPCM7XX_MKFUNC(hgpio6),<br>
+ NPCM7XX_MKFUNC(hgpio7),<br>
};<br>
<br>
#define NPCM7XX_PINCFG(a, b, c, d, e, f, g, h, i, j, k) \<br>
@@ -944,12 +977,12 @@ static const struct npcm7xx_pincfg pincfg[] = {<br>
NPCM7XX_PINCFG(17, pspi2, MFSEL3, 13, smb4den, I2CSEGSEL, 23, none, NONE, 0, DS(8, 12)),<br>
NPCM7XX_PINCFG(18, pspi2, MFSEL3, 13, smb4b, I2CSEGSEL, 14, none, NONE, 0, DS(8, 12)),<br>
NPCM7XX_PINCFG(19, pspi2, MFSEL3, 13, smb4b, I2CSEGSEL, 14, none, NONE, 0, DS(8, 12)),<br>
- NPCM7XX_PINCFG(20, smb4c, I2CSEGSEL, 15, smb15, MFSEL3, 8, none, NONE, 0, 0),<br>
- NPCM7XX_PINCFG(21, smb4c, I2CSEGSEL, 15, smb15, MFSEL3, 8, none, NONE, 0, 0),<br>
- NPCM7XX_PINCFG(22, smb4d, I2CSEGSEL, 16, smb14, MFSEL3, 7, none, NONE, 0, 0),<br>
- NPCM7XX_PINCFG(23, smb4d, I2CSEGSEL, 16, smb14, MFSEL3, 7, none, NONE, 0, 0),<br>
- NPCM7XX_PINCFG(24, ioxh, MFSEL3, 18, none, NONE, 0, none, NONE, 0, DS(8, 12)),<br>
- NPCM7XX_PINCFG(25, ioxh, MFSEL3, 18, none, NONE, 0, none, NONE, 0, DS(8, 12)),<br>
+ NPCM7XX_PINCFG(20, hgpio0, MFSEL2, 24, smb15, MFSEL3, 8, smb4c, I2CSEGSEL, 15, 0),<br>
+ NPCM7XX_PINCFG(21, hgpio1, MFSEL2, 25, smb15, MFSEL3, 8, smb4c, I2CSEGSEL, 15, 0),<br>
+ NPCM7XX_PINCFG(22, hgpio2, MFSEL2, 26, smb14, MFSEL3, 7, smb4d, I2CSEGSEL, 16, 0),<br>
+ NPCM7XX_PINCFG(23, hgpio3, MFSEL2, 27, smb14, MFSEL3, 7, smb4d, I2CSEGSEL, 16, 0),<br>
+ NPCM7XX_PINCFG(24, hgpio4, MFSEL2, 28, ioxh, MFSEL3, 18, none, NONE, 0, DS(8, 12)),<br>
+ NPCM7XX_PINCFG(25, hgpio5, MFSEL2, 29, ioxh, MFSEL3, 18, none, NONE, 0, DS(8, 12)),<br>
NPCM7XX_PINCFG(26, smb5, MFSEL1, 2, none, NONE, 0, none, NONE, 0, 0),<br>
NPCM7XX_PINCFG(27, smb5, MFSEL1, 2, none, NONE, 0, none, NONE, 0, 0),<br>
NPCM7XX_PINCFG(28, smb4, MFSEL1, 1, none, NONE, 0, none, NONE, 0, 0),<br>
@@ -982,8 +1015,8 @@ static const struct npcm7xx_pincfg pincfg[] = {<br>
NPCM7XX_PINCFG(56, r1err, MFSEL1, 12, none, NONE, 0, none, NONE, 0, 0),<br>
NPCM7XX_PINCFG(57, r1md, MFSEL1, 13, none, NONE, 0, none, NONE, 0, DS(2, 4)),<br>
NPCM7XX_PINCFG(58, r1md, MFSEL1, 13, none, NONE, 0, none, NONE, 0, DS(2, 4)),<br>
- NPCM7XX_PINCFG(59, smb3d, I2CSEGSEL, 13, none, NONE, 0, none, NONE, 0, 0),<br>
- NPCM7XX_PINCFG(60, smb3d, I2CSEGSEL, 13, none, NONE, 0, none, NONE, 0, 0),<br>
+ NPCM7XX_PINCFG(59, hgpio6, MFSEL2, 30, smb3d, I2CSEGSEL, 13, none, NONE, 0, 0),<br>
+ NPCM7XX_PINCFG(60, hgpio7, MFSEL2, 31, smb3d, I2CSEGSEL, 13, none, NONE, 0, 0),<br>
NPCM7XX_PINCFG(61, uart1, MFSEL1, 10, none, NONE, 0, none, NONE, 0, GPO),<br>
NPCM7XX_PINCFG(62, uart1, MFSEL1, 10, bmcuart1, MFSEL3, 24, none, NONE, 0, GPO),<br>
NPCM7XX_PINCFG(63, uart1, MFSEL1, 10, bmcuart1, MFSEL3, 24, none, NONE, 0, GPO),<br>
@@ -1188,12 +1221,12 @@ static const struct pinctrl_pin_desc npcm7xx_pins[] = {<br>
PINCTRL_PIN(17, "GPIO17/PSPI2DI/SMB4DEN"),<br>
PINCTRL_PIN(18, "GPIO18/PSPI2D0/SMB4BSDA"),<br>
PINCTRL_PIN(19, "GPIO19/PSPI2CK/SMB4BSCL"),<br>
- PINCTRL_PIN(20, "GPIO20/SMB4CSDA/SMB15SDA"),<br>
- PINCTRL_PIN(21, "GPIO21/SMB4CSCL/SMB15SCL"),<br>
- PINCTRL_PIN(22, "GPIO22/SMB4DSDA/SMB14SDA"),<br>
- PINCTRL_PIN(23, "GPIO23/SMB4DSCL/SMB14SCL"),<br>
- PINCTRL_PIN(24, "GPIO24/IOXHDO"),<br>
- PINCTRL_PIN(25, "GPIO25/IOXHDI"),<br>
+ PINCTRL_PIN(20, "GPIO20/HGPIO0/SMB4CSDA/SMB15SDA"),<br>
+ PINCTRL_PIN(21, "GPIO21/HGPIO1/SMB4CSCL/SMB15SCL"),<br>
+ PINCTRL_PIN(22, "GPIO22/HGPIO2/SMB4DSDA/SMB14SDA"),<br>
+ PINCTRL_PIN(23, "GPIO23/HGPIO3/SMB4DSCL/SMB14SCL"),<br>
+ PINCTRL_PIN(24, "GPIO24/HGPIO4/IOXHDO"),<br>
+ PINCTRL_PIN(25, "GPIO25/HGPIO5/IOXHDI"),<br>
PINCTRL_PIN(26, "GPIO26/SMB5SDA"),<br>
PINCTRL_PIN(27, "GPIO27/SMB5SCL"),<br>
PINCTRL_PIN(28, "GPIO28/SMB4SDA"),<br>
@@ -1226,8 +1259,8 @@ static const struct pinctrl_pin_desc npcm7xx_pins[] = {<br>
PINCTRL_PIN(56, "GPIO56/R1RXERR"),<br>
PINCTRL_PIN(57, "GPIO57/R1MDC"),<br>
PINCTRL_PIN(58, "GPIO58/R1MDIO"),<br>
- PINCTRL_PIN(59, "GPIO59/SMB3DSDA"),<br>
- PINCTRL_PIN(60, "GPIO60/SMB3DSCL"),<br>
+ PINCTRL_PIN(59, "GPIO59/HGPIO6/SMB3DSDA"),<br>
+ PINCTRL_PIN(60, "GPIO60/HGPIO7/SMB3DSCL"),<br>
PINCTRL_PIN(61, "GPO61/nDTR1_BOUT1/STRAP6"),<br>
PINCTRL_PIN(62, "GPO62/nRTST1/STRAP5"),<br>
PINCTRL_PIN(63, "GPO63/TXD1/STRAP4"),<br>
-- <br>
2.22.0<br>
<br>
</blockquote></div></div>
</div>