Message ID | 20220325154048.467245-4-quic_jaehyoo@quicinc.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v2,1/5] ARM: dts: aspeed-g6: remove FWQSPID group in pinctrl dtsi | expand |
On Sat, 26 Mar 2022, at 02:10, Jae Hyun Yoo wrote: > From: Johnny Huang <johnny_huang@aspeedtech.com> > > Add FWSPIDQ2 (AE12) and FWSPIDQ3 (AF12) function-group to support > AST2600 FW SPI quad mode. These pins can be used with dedicated FW > SPI pins - FWSPICS0# (AB14), FWSPICK (AF13), FWSPIMOSI (AC14) > and FWSPIMISO (AB13). > > Signed-off-by: Johnny Huang <johnny_huang@aspeedtech.com> > Signed-off-by: Jae Hyun Yoo <quic_jaehyoo@quicinc.com> > --- > Changes in v2: > * None. > > drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c > b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c > index 54064714d73f..80838dc54b3a 100644 > --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c > +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c > @@ -1236,12 +1236,17 @@ FUNC_GROUP_DECL(SALT8, AA12); > FUNC_GROUP_DECL(WDTRST4, AA12); > > #define AE12 196 > +SIG_EXPR_LIST_DECL_SESG(AE12, FWSPIQ2, FWQSPI, SIG_DESC_SET(SCU438, 4)); > SIG_EXPR_LIST_DECL_SESG(AE12, GPIOY4, GPIOY4); > -PIN_DECL_(AE12, SIG_EXPR_LIST_PTR(AE12, GPIOY4)); > +PIN_DECL_(AE12, SIG_EXPR_LIST_PTR(AE12, FWSPIQ2), > + SIG_EXPR_LIST_PTR(AE12, GPIOY4)); > > #define AF12 197 > +SIG_EXPR_LIST_DECL_SESG(AF12, FWSPIQ3, FWQSPI, SIG_DESC_SET(SCU438, 5)); > SIG_EXPR_LIST_DECL_SESG(AF12, GPIOY5, GPIOY5); > -PIN_DECL_(AF12, SIG_EXPR_LIST_PTR(AF12, GPIOY5)); > +PIN_DECL_(AF12, SIG_EXPR_LIST_PTR(AF12, FWSPIQ3), > + SIG_EXPR_LIST_PTR(AF12, GPIOY5)); > +FUNC_GROUP_DECL(FWQSPI, AE12, AF12); > > #define AC12 198 > SSSF_PIN_DECL(AC12, GPIOY6, FWSPIABR, SIG_DESC_SET(SCU438, 6)); > @@ -1911,6 +1916,7 @@ static const struct aspeed_pin_group > aspeed_g6_groups[] = { > ASPEED_PINCTRL_GROUP(FSI2), > ASPEED_PINCTRL_GROUP(FWSPIABR), > ASPEED_PINCTRL_GROUP(FWSPID), > + ASPEED_PINCTRL_GROUP(FWQSPI), > ASPEED_PINCTRL_GROUP(FWSPIWP), > ASPEED_PINCTRL_GROUP(GPIT0), > ASPEED_PINCTRL_GROUP(GPIT1), > @@ -2152,6 +2158,7 @@ static const struct aspeed_pin_function > aspeed_g6_functions[] = { > ASPEED_PINCTRL_FUNC(FSI2), > ASPEED_PINCTRL_FUNC(FWSPIABR), > ASPEED_PINCTRL_FUNC(FWSPID), > + ASPEED_PINCTRL_FUNC(FWQSPI), You need to update the binding documentation as well. Andrew
On 3/27/2022 8:15 PM, Andrew Jeffery wrote: > > > On Sat, 26 Mar 2022, at 02:10, Jae Hyun Yoo wrote: >> From: Johnny Huang <johnny_huang@aspeedtech.com> >> >> Add FWSPIDQ2 (AE12) and FWSPIDQ3 (AF12) function-group to support >> AST2600 FW SPI quad mode. These pins can be used with dedicated FW >> SPI pins - FWSPICS0# (AB14), FWSPICK (AF13), FWSPIMOSI (AC14) >> and FWSPIMISO (AB13). >> >> Signed-off-by: Johnny Huang <johnny_huang@aspeedtech.com> >> Signed-off-by: Jae Hyun Yoo <quic_jaehyoo@quicinc.com> >> --- >> Changes in v2: >> * None. >> >> drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 11 +++++++++-- >> 1 file changed, 9 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c >> b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c >> index 54064714d73f..80838dc54b3a 100644 >> --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c >> +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c >> @@ -1236,12 +1236,17 @@ FUNC_GROUP_DECL(SALT8, AA12); >> FUNC_GROUP_DECL(WDTRST4, AA12); >> >> #define AE12 196 >> +SIG_EXPR_LIST_DECL_SESG(AE12, FWSPIQ2, FWQSPI, SIG_DESC_SET(SCU438, 4)); >> SIG_EXPR_LIST_DECL_SESG(AE12, GPIOY4, GPIOY4); >> -PIN_DECL_(AE12, SIG_EXPR_LIST_PTR(AE12, GPIOY4)); >> +PIN_DECL_(AE12, SIG_EXPR_LIST_PTR(AE12, FWSPIQ2), >> + SIG_EXPR_LIST_PTR(AE12, GPIOY4)); >> >> #define AF12 197 >> +SIG_EXPR_LIST_DECL_SESG(AF12, FWSPIQ3, FWQSPI, SIG_DESC_SET(SCU438, 5)); >> SIG_EXPR_LIST_DECL_SESG(AF12, GPIOY5, GPIOY5); >> -PIN_DECL_(AF12, SIG_EXPR_LIST_PTR(AF12, GPIOY5)); >> +PIN_DECL_(AF12, SIG_EXPR_LIST_PTR(AF12, FWSPIQ3), >> + SIG_EXPR_LIST_PTR(AF12, GPIOY5)); >> +FUNC_GROUP_DECL(FWQSPI, AE12, AF12); >> >> #define AC12 198 >> SSSF_PIN_DECL(AC12, GPIOY6, FWSPIABR, SIG_DESC_SET(SCU438, 6)); >> @@ -1911,6 +1916,7 @@ static const struct aspeed_pin_group >> aspeed_g6_groups[] = { >> ASPEED_PINCTRL_GROUP(FSI2), >> ASPEED_PINCTRL_GROUP(FWSPIABR), >> ASPEED_PINCTRL_GROUP(FWSPID), >> + ASPEED_PINCTRL_GROUP(FWQSPI), >> ASPEED_PINCTRL_GROUP(FWSPIWP), >> ASPEED_PINCTRL_GROUP(GPIT0), >> ASPEED_PINCTRL_GROUP(GPIT1), >> @@ -2152,6 +2158,7 @@ static const struct aspeed_pin_function >> aspeed_g6_functions[] = { >> ASPEED_PINCTRL_FUNC(FSI2), >> ASPEED_PINCTRL_FUNC(FWSPIABR), >> ASPEED_PINCTRL_FUNC(FWSPID), >> + ASPEED_PINCTRL_FUNC(FWQSPI), > > You need to update the binding documentation as well. Will do it in v3. Thanks, Jae
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c index 54064714d73f..80838dc54b3a 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c @@ -1236,12 +1236,17 @@ FUNC_GROUP_DECL(SALT8, AA12); FUNC_GROUP_DECL(WDTRST4, AA12); #define AE12 196 +SIG_EXPR_LIST_DECL_SESG(AE12, FWSPIQ2, FWQSPI, SIG_DESC_SET(SCU438, 4)); SIG_EXPR_LIST_DECL_SESG(AE12, GPIOY4, GPIOY4); -PIN_DECL_(AE12, SIG_EXPR_LIST_PTR(AE12, GPIOY4)); +PIN_DECL_(AE12, SIG_EXPR_LIST_PTR(AE12, FWSPIQ2), + SIG_EXPR_LIST_PTR(AE12, GPIOY4)); #define AF12 197 +SIG_EXPR_LIST_DECL_SESG(AF12, FWSPIQ3, FWQSPI, SIG_DESC_SET(SCU438, 5)); SIG_EXPR_LIST_DECL_SESG(AF12, GPIOY5, GPIOY5); -PIN_DECL_(AF12, SIG_EXPR_LIST_PTR(AF12, GPIOY5)); +PIN_DECL_(AF12, SIG_EXPR_LIST_PTR(AF12, FWSPIQ3), + SIG_EXPR_LIST_PTR(AF12, GPIOY5)); +FUNC_GROUP_DECL(FWQSPI, AE12, AF12); #define AC12 198 SSSF_PIN_DECL(AC12, GPIOY6, FWSPIABR, SIG_DESC_SET(SCU438, 6)); @@ -1911,6 +1916,7 @@ static const struct aspeed_pin_group aspeed_g6_groups[] = { ASPEED_PINCTRL_GROUP(FSI2), ASPEED_PINCTRL_GROUP(FWSPIABR), ASPEED_PINCTRL_GROUP(FWSPID), + ASPEED_PINCTRL_GROUP(FWQSPI), ASPEED_PINCTRL_GROUP(FWSPIWP), ASPEED_PINCTRL_GROUP(GPIT0), ASPEED_PINCTRL_GROUP(GPIT1), @@ -2152,6 +2158,7 @@ static const struct aspeed_pin_function aspeed_g6_functions[] = { ASPEED_PINCTRL_FUNC(FSI2), ASPEED_PINCTRL_FUNC(FWSPIABR), ASPEED_PINCTRL_FUNC(FWSPID), + ASPEED_PINCTRL_FUNC(FWQSPI), ASPEED_PINCTRL_FUNC(FWSPIWP), ASPEED_PINCTRL_FUNC(GPIT0), ASPEED_PINCTRL_FUNC(GPIT1),