diff options
| -rw-r--r-- | drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c index e1ab864e1a7f..14639834a5eb 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | |||
| @@ -151,21 +151,21 @@ FUNC_GROUP_DECL(GPID0, F19, E21); | |||
| 151 | 151 | ||
| 152 | #define GPID2_DESC SIG_DESC_SET(SCU8C, 9) | 152 | #define GPID2_DESC SIG_DESC_SET(SCU8C, 9) |
| 153 | 153 | ||
| 154 | #define D20 26 | 154 | #define F20 26 |
| 155 | SIG_EXPR_LIST_DECL_SINGLE(SD2DAT0, SD2, SD2_DESC); | 155 | SIG_EXPR_LIST_DECL_SINGLE(SD2DAT0, SD2, SD2_DESC); |
| 156 | SIG_EXPR_DECL(GPID2IN, GPID2, GPID2_DESC); | 156 | SIG_EXPR_DECL(GPID2IN, GPID2, GPID2_DESC); |
| 157 | SIG_EXPR_DECL(GPID2IN, GPID, GPID_DESC); | 157 | SIG_EXPR_DECL(GPID2IN, GPID, GPID_DESC); |
| 158 | SIG_EXPR_LIST_DECL_DUAL(GPID2IN, GPID2, GPID); | 158 | SIG_EXPR_LIST_DECL_DUAL(GPID2IN, GPID2, GPID); |
| 159 | MS_PIN_DECL(D20, GPIOD2, SD2DAT0, GPID2IN); | 159 | MS_PIN_DECL(F20, GPIOD2, SD2DAT0, GPID2IN); |
| 160 | 160 | ||
| 161 | #define D21 27 | 161 | #define D20 27 |
| 162 | SIG_EXPR_LIST_DECL_SINGLE(SD2DAT1, SD2, SD2_DESC); | 162 | SIG_EXPR_LIST_DECL_SINGLE(SD2DAT1, SD2, SD2_DESC); |
| 163 | SIG_EXPR_DECL(GPID2OUT, GPID2, GPID2_DESC); | 163 | SIG_EXPR_DECL(GPID2OUT, GPID2, GPID2_DESC); |
| 164 | SIG_EXPR_DECL(GPID2OUT, GPID, GPID_DESC); | 164 | SIG_EXPR_DECL(GPID2OUT, GPID, GPID_DESC); |
| 165 | SIG_EXPR_LIST_DECL_DUAL(GPID2OUT, GPID2, GPID); | 165 | SIG_EXPR_LIST_DECL_DUAL(GPID2OUT, GPID2, GPID); |
| 166 | MS_PIN_DECL(D21, GPIOD3, SD2DAT1, GPID2OUT); | 166 | MS_PIN_DECL(D20, GPIOD3, SD2DAT1, GPID2OUT); |
| 167 | 167 | ||
| 168 | FUNC_GROUP_DECL(GPID2, D20, D21); | 168 | FUNC_GROUP_DECL(GPID2, F20, D20); |
| 169 | 169 | ||
| 170 | #define GPIE_DESC SIG_DESC_SET(HW_STRAP1, 21) | 170 | #define GPIE_DESC SIG_DESC_SET(HW_STRAP1, 21) |
| 171 | #define GPIE0_DESC SIG_DESC_SET(SCU8C, 12) | 171 | #define GPIE0_DESC SIG_DESC_SET(SCU8C, 12) |
| @@ -614,7 +614,6 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = { | |||
| 614 | ASPEED_PINCTRL_PIN(D10), | 614 | ASPEED_PINCTRL_PIN(D10), |
| 615 | ASPEED_PINCTRL_PIN(D2), | 615 | ASPEED_PINCTRL_PIN(D2), |
| 616 | ASPEED_PINCTRL_PIN(D20), | 616 | ASPEED_PINCTRL_PIN(D20), |
| 617 | ASPEED_PINCTRL_PIN(D21), | ||
| 618 | ASPEED_PINCTRL_PIN(D4), | 617 | ASPEED_PINCTRL_PIN(D4), |
| 619 | ASPEED_PINCTRL_PIN(D5), | 618 | ASPEED_PINCTRL_PIN(D5), |
| 620 | ASPEED_PINCTRL_PIN(D6), | 619 | ASPEED_PINCTRL_PIN(D6), |
| @@ -630,6 +629,7 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = { | |||
| 630 | ASPEED_PINCTRL_PIN(E7), | 629 | ASPEED_PINCTRL_PIN(E7), |
| 631 | ASPEED_PINCTRL_PIN(E9), | 630 | ASPEED_PINCTRL_PIN(E9), |
| 632 | ASPEED_PINCTRL_PIN(F19), | 631 | ASPEED_PINCTRL_PIN(F19), |
| 632 | ASPEED_PINCTRL_PIN(F20), | ||
| 633 | ASPEED_PINCTRL_PIN(F9), | 633 | ASPEED_PINCTRL_PIN(F9), |
| 634 | ASPEED_PINCTRL_PIN(H20), | 634 | ASPEED_PINCTRL_PIN(H20), |
| 635 | ASPEED_PINCTRL_PIN(L1), | 635 | ASPEED_PINCTRL_PIN(L1), |
