| Message ID | 69eda17c16684f4212a9f3e64d9587abfcc7ae74.1474986045.git-series.andrew@aj.id.au |
|---|---|
| State | Accepted, archived |
| Delegated to: | Joel Stanley |
| Headers | show |
On Wed, Sep 28, 2016 at 12:20 AM, Andrew Jeffery <andrew@aj.id.au> wrote: > Fixes simple typos in the initial commit. There is no behavioural > change. > > Fixes: 56e57cb6c07f (pinctrl: Add pinctrl-aspeed-g5 driver) > Reported-by: Xo Wang <xow@google.com> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 12 ++++++------ > 1 file 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); > > #define GPID2_DESC SIG_DESC_SET(SCU8C, 9) > > -#define D20 26 > +#define F20 26 > SIG_EXPR_LIST_DECL_SINGLE(SD2DAT0, SD2, SD2_DESC); > SIG_EXPR_DECL(GPID2IN, GPID2, GPID2_DESC); > SIG_EXPR_DECL(GPID2IN, GPID, GPID_DESC); > SIG_EXPR_LIST_DECL_DUAL(GPID2IN, GPID2, GPID); > -MS_PIN_DECL(D20, GPIOD2, SD2DAT0, GPID2IN); > +MS_PIN_DECL(F20, GPIOD2, SD2DAT0, GPID2IN); > > -#define D21 27 > +#define D20 27 > SIG_EXPR_LIST_DECL_SINGLE(SD2DAT1, SD2, SD2_DESC); > SIG_EXPR_DECL(GPID2OUT, GPID2, GPID2_DESC); > SIG_EXPR_DECL(GPID2OUT, GPID, GPID_DESC); > SIG_EXPR_LIST_DECL_DUAL(GPID2OUT, GPID2, GPID); > -MS_PIN_DECL(D21, GPIOD3, SD2DAT1, GPID2OUT); > +MS_PIN_DECL(D20, GPIOD3, SD2DAT1, GPID2OUT); > > -FUNC_GROUP_DECL(GPID2, D20, D21); > +FUNC_GROUP_DECL(GPID2, F20, D20); > > #define GPIE_DESC SIG_DESC_SET(HW_STRAP1, 21) > #define GPIE0_DESC SIG_DESC_SET(SCU8C, 12) > @@ -614,7 +614,6 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = { > ASPEED_PINCTRL_PIN(D10), > ASPEED_PINCTRL_PIN(D2), > ASPEED_PINCTRL_PIN(D20), > - ASPEED_PINCTRL_PIN(D21), > ASPEED_PINCTRL_PIN(D4), > ASPEED_PINCTRL_PIN(D5), > ASPEED_PINCTRL_PIN(D6), > @@ -630,6 +629,7 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = { > ASPEED_PINCTRL_PIN(E7), > ASPEED_PINCTRL_PIN(E9), > ASPEED_PINCTRL_PIN(F19), > + ASPEED_PINCTRL_PIN(F20), > ASPEED_PINCTRL_PIN(F9), > ASPEED_PINCTRL_PIN(H20), > ASPEED_PINCTRL_PIN(L1), > -- > git-series 0.8.10
On Tue, Sep 27, 2016 at 4:50 PM, Andrew Jeffery <andrew@aj.id.au> wrote: > Fixes simple typos in the initial commit. There is no behavioural > change. > > Fixes: 56e57cb6c07f (pinctrl: Add pinctrl-aspeed-g5 driver) > Reported-by: Xo Wang <xow@google.com> > Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Patch applied for fixes. Yours, Linus Walleij
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); #define GPID2_DESC SIG_DESC_SET(SCU8C, 9) -#define D20 26 +#define F20 26 SIG_EXPR_LIST_DECL_SINGLE(SD2DAT0, SD2, SD2_DESC); SIG_EXPR_DECL(GPID2IN, GPID2, GPID2_DESC); SIG_EXPR_DECL(GPID2IN, GPID, GPID_DESC); SIG_EXPR_LIST_DECL_DUAL(GPID2IN, GPID2, GPID); -MS_PIN_DECL(D20, GPIOD2, SD2DAT0, GPID2IN); +MS_PIN_DECL(F20, GPIOD2, SD2DAT0, GPID2IN); -#define D21 27 +#define D20 27 SIG_EXPR_LIST_DECL_SINGLE(SD2DAT1, SD2, SD2_DESC); SIG_EXPR_DECL(GPID2OUT, GPID2, GPID2_DESC); SIG_EXPR_DECL(GPID2OUT, GPID, GPID_DESC); SIG_EXPR_LIST_DECL_DUAL(GPID2OUT, GPID2, GPID); -MS_PIN_DECL(D21, GPIOD3, SD2DAT1, GPID2OUT); +MS_PIN_DECL(D20, GPIOD3, SD2DAT1, GPID2OUT); -FUNC_GROUP_DECL(GPID2, D20, D21); +FUNC_GROUP_DECL(GPID2, F20, D20); #define GPIE_DESC SIG_DESC_SET(HW_STRAP1, 21) #define GPIE0_DESC SIG_DESC_SET(SCU8C, 12) @@ -614,7 +614,6 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = { ASPEED_PINCTRL_PIN(D10), ASPEED_PINCTRL_PIN(D2), ASPEED_PINCTRL_PIN(D20), - ASPEED_PINCTRL_PIN(D21), ASPEED_PINCTRL_PIN(D4), ASPEED_PINCTRL_PIN(D5), ASPEED_PINCTRL_PIN(D6), @@ -630,6 +629,7 @@ static struct pinctrl_pin_desc aspeed_g5_pins[ASPEED_G5_NR_PINS] = { ASPEED_PINCTRL_PIN(E7), ASPEED_PINCTRL_PIN(E9), ASPEED_PINCTRL_PIN(F19), + ASPEED_PINCTRL_PIN(F20), ASPEED_PINCTRL_PIN(F9), ASPEED_PINCTRL_PIN(H20), ASPEED_PINCTRL_PIN(L1),
Fixes simple typos in the initial commit. There is no behavioural change. Fixes: 56e57cb6c07f (pinctrl: Add pinctrl-aspeed-g5 driver) Reported-by: Xo Wang <xow@google.com> Signed-off-by: Andrew Jeffery <andrew@aj.id.au> --- drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)