Skip to content

Commit b1d4c90

Browse files
aspeedJackylinusw
authored andcommitted
pinctrl: aspeed-g6: Add PCIe RC PERST pin group
The PCIe RC PERST uses SSPRST# as PERST# and enable this pin to output. Signed-off-by: Jacky Chou <[email protected]> Acked-by: Linus Walleij <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 0bbd90c commit b1d4c90

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "../pinctrl-utils.h"
1818
#include "pinctrl-aspeed.h"
1919

20+
#define SCU040 0x040 /* Reset Control Set 1 */
2021
#define SCU400 0x400 /* Multi-function Pin Control #1 */
2122
#define SCU404 0x404 /* Multi-function Pin Control #2 */
2223
#define SCU40C 0x40C /* Multi-function Pin Control #3 */
@@ -52,7 +53,7 @@
5253
#define SCU6D0 0x6D0 /* Multi-function Pin Control #29 */
5354
#define SCUC20 0xC20 /* PCIE configuration Setting Control */
5455

55-
#define ASPEED_G6_NR_PINS 256
56+
#define ASPEED_G6_NR_PINS 258
5657

5758
#define M24 0
5859
SIG_EXPR_LIST_DECL_SESG(M24, MDC3, MDIO3, SIG_DESC_SET(SCU410, 0));
@@ -1636,6 +1637,12 @@ FUNC_DECL_1(USB11BHID, USBB);
16361637
FUNC_DECL_1(USB2BD, USBB);
16371638
FUNC_DECL_1(USB2BH, USBB);
16381639

1640+
#define D7 257
1641+
SIG_EXPR_LIST_DECL_SESG(D7, RCRST, PCIERC1, SIG_DESC_SET(SCU040, 19),
1642+
SIG_DESC_SET(SCU500, 24));
1643+
PIN_DECL_(D7, SIG_EXPR_LIST_PTR(D7, RCRST));
1644+
FUNC_GROUP_DECL(PCIERC1, D7);
1645+
16391646
/* Pins, groups and functions are sort(1):ed alphabetically for sanity */
16401647

16411648
static struct pinctrl_pin_desc aspeed_g6_pins[ASPEED_G6_NR_PINS] = {
@@ -1806,6 +1813,7 @@ static struct pinctrl_pin_desc aspeed_g6_pins[ASPEED_G6_NR_PINS] = {
18061813
ASPEED_PINCTRL_PIN(D4),
18071814
ASPEED_PINCTRL_PIN(D5),
18081815
ASPEED_PINCTRL_PIN(D6),
1816+
ASPEED_PINCTRL_PIN(D7),
18091817
ASPEED_PINCTRL_PIN(E1),
18101818
ASPEED_PINCTRL_PIN(E11),
18111819
ASPEED_PINCTRL_PIN(E12),
@@ -2073,6 +2081,7 @@ static const struct aspeed_pin_group aspeed_g6_groups[] = {
20732081
ASPEED_PINCTRL_GROUP(SALT9G1),
20742082
ASPEED_PINCTRL_GROUP(SD1),
20752083
ASPEED_PINCTRL_GROUP(SD2),
2084+
ASPEED_PINCTRL_GROUP(PCIERC1),
20762085
ASPEED_PINCTRL_GROUP(EMMCG1),
20772086
ASPEED_PINCTRL_GROUP(EMMCG4),
20782087
ASPEED_PINCTRL_GROUP(EMMCG8),
@@ -2314,6 +2323,7 @@ static const struct aspeed_pin_function aspeed_g6_functions[] = {
23142323
ASPEED_PINCTRL_FUNC(SPI2),
23152324
ASPEED_PINCTRL_FUNC(SPI2CS1),
23162325
ASPEED_PINCTRL_FUNC(SPI2CS2),
2326+
ASPEED_PINCTRL_FUNC(PCIERC1),
23172327
ASPEED_PINCTRL_FUNC(TACH0),
23182328
ASPEED_PINCTRL_FUNC(TACH1),
23192329
ASPEED_PINCTRL_FUNC(TACH10),

0 commit comments

Comments
 (0)