pinctrl: aspeed: Fix names for balls at GPIOD2,3

PATCH In review Xo Wang 2 participants 2 messages Sep 27, 2016

Subsystems (3)

Pin control Arm/Aspeed machine support Aspeed pinctrl drivers

lore

Share & tools

lore

Xo Wang

author

2016-09-27 01:33 UTC #0 lore raw

PATCH v2 1/1 pinctrl: aspeed: Fix names for balls at GPIOD2,3

Update ball names in SDIO block per AST2500 pin mapping table. Functions and select expressions are correct; they were just one ball low.

Signed-off-by Xo Wang <[email protected]>

---
Changes for v2: now it compiles.

---
 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +6 -6

index c98beb6..d8e5824 100644
@@ -129,21 +129,21 @@ FUNC_GROUP_DECL(GPID0, F19, E21);
 
 #define GPID1_DESC      SIG_DESC_SET(SCU8C, 9)
 
-#define D20 26
+#define F20 26
 SIG_EXPR_LIST_DECL_SINGLE(SD2DAT0, SD2, SD2_DESC);
 SIG_EXPR_DECL(GPID1IN, GPID1, GPID1_DESC);
 SIG_EXPR_DECL(GPID1IN, GPID, GPID_DESC);
 SIG_EXPR_LIST_DECL_DUAL(GPID1IN, GPID1, GPID);
-MS_PIN_DECL(D20, GPIOD2, SD2DAT0, GPID1IN);
+MS_PIN_DECL(F20, GPIOD2, SD2DAT0, GPID1IN);
 
-#define D21 27
+#define D20 27
 SIG_EXPR_LIST_DECL_SINGLE(SD2DAT1, SD2, SD2_DESC);
 SIG_EXPR_DECL(GPID1OUT, GPID1, GPID1_DESC);
 SIG_EXPR_DECL(GPID1OUT, GPID, GPID_DESC);
 SIG_EXPR_LIST_DECL_DUAL(GPID1OUT, GPID1, GPID);
-MS_PIN_DECL(D21, GPIOD3, SD2DAT1, GPID1OUT);
+MS_PIN_DECL(D20, GPIOD3, SD2DAT1, GPID1OUT);
 
-FUNC_GROUP_DECL(GPID1, D20, D21);
+FUNC_GROUP_DECL(GPID1, F20, D20);
 
 #define I2C5_DESC       SIG_DESC_SET(SCU90, 18)

@@ -522,8 +522,8 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = {
 	ASPEED_PINCTRL_PIN(D1),
 	ASPEED_PINCTRL_PIN(D10),
 	ASPEED_PINCTRL_PIN(D2),
+	ASPEED_PINCTRL_PIN(F20),
 	ASPEED_PINCTRL_PIN(D20),
-	ASPEED_PINCTRL_PIN(D21),
 	ASPEED_PINCTRL_PIN(D4),
 	ASPEED_PINCTRL_PIN(D5),
 	ASPEED_PINCTRL_PIN(D6),

Signature · 1 line

2.8.0.rc3.226.g39d4020

Andrew Jeffery

2016-09-27 01:41 UTC #1 lore raw

Hi Xo,

Quoted 2 lines · Xo Wang

Update ball names in SDIO block per AST2500 pin mapping table. Functions and select expressions are correct; they were just one ball low.

Thanks. I also found this whilst preparing some follow-up patches which I'm hoping to send out shortly. I'll add your Reported-by.

Cheers,

Andrew

Quoted 49 lines

Signed-off-by Xo Wang <[email protected]>
---
Changes for v2: now it compiles.
---
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +0 -0
index c98beb6..d8e5824 100644
@@ -129,21 +129,21 @@ FUNC_GROUP_DECL(GPID0, F19, E21);
#define GPID1_DESC SIG_DESC_SET(SCU8C, 9)
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +1 -1
-#define D20 26
+#define F20 26
SIG_EXPR_LIST_DECL_SINGLE(SD2DAT0, SD2, SD2_DESC); SIG_EXPR_DECL(GPID1IN, GPID1, GPID1_DESC); SIG_EXPR_DECL(GPID1IN, GPID, GPID_DESC); SIG_EXPR_LIST_DECL_DUAL(GPID1IN, GPID1, GPID);
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +1 -1
-MS_PIN_DECL(D20, GPIOD2, SD2DAT0, GPID1IN);
+MS_PIN_DECL(F20, GPIOD2, SD2DAT0, GPID1IN);
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +1 -1
-#define D21 27
+#define D20 27
SIG_EXPR_LIST_DECL_SINGLE(SD2DAT1, SD2, SD2_DESC); SIG_EXPR_DECL(GPID1OUT, GPID1, GPID1_DESC); SIG_EXPR_DECL(GPID1OUT, GPID, GPID_DESC); SIG_EXPR_LIST_DECL_DUAL(GPID1OUT, GPID1, GPID);
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +1 -1
-MS_PIN_DECL(D21, GPIOD3, SD2DAT1, GPID1OUT);
+MS_PIN_DECL(D20, GPIOD3, SD2DAT1, GPID1OUT);
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +1 -1
-FUNC_GROUP_DECL(GPID1, D20, D21);
+FUNC_GROUP_DECL(GPID1, F20, D20);
#define I2C5_DESC SIG_DESC_SET(SCU90, 18)
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +1 -1
@@ -522,8 +522,8 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = {
  	ASPEED_PINCTRL_PIN(D1),
  	ASPEED_PINCTRL_PIN(D10),
  	ASPEED_PINCTRL_PIN(D2),
+	ASPEED_PINCTRL_PIN(F20),
  	ASPEED_PINCTRL_PIN(D20),
-	ASPEED_PINCTRL_PIN(D21),
  	ASPEED_PINCTRL_PIN(D4),
  	ASPEED_PINCTRL_PIN(D5),
  	ASPEED_PINCTRL_PIN(D6),