|
17 | 17 | #include "../pinctrl-utils.h"
|
18 | 18 | #include "pinctrl-aspeed.h"
|
19 | 19 |
|
| 20 | +#define SCU040 0x040 /* Reset Control Set 1 */ |
20 | 21 | #define SCU400 0x400 /* Multi-function Pin Control #1 */
|
21 | 22 | #define SCU404 0x404 /* Multi-function Pin Control #2 */
|
22 | 23 | #define SCU40C 0x40C /* Multi-function Pin Control #3 */
|
|
52 | 53 | #define SCU6D0 0x6D0 /* Multi-function Pin Control #29 */
|
53 | 54 | #define SCUC20 0xC20 /* PCIE configuration Setting Control */
|
54 | 55 |
|
55 |
| -#define ASPEED_G6_NR_PINS 256 |
| 56 | +#define ASPEED_G6_NR_PINS 258 |
56 | 57 |
|
57 | 58 | #define M24 0
|
58 | 59 | SIG_EXPR_LIST_DECL_SESG(M24, MDC3, MDIO3, SIG_DESC_SET(SCU410, 0));
|
@@ -1636,6 +1637,12 @@ FUNC_DECL_1(USB11BHID, USBB);
|
1636 | 1637 | FUNC_DECL_1(USB2BD, USBB);
|
1637 | 1638 | FUNC_DECL_1(USB2BH, USBB);
|
1638 | 1639 |
|
| 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 | + |
1639 | 1646 | /* Pins, groups and functions are sort(1):ed alphabetically for sanity */
|
1640 | 1647 |
|
1641 | 1648 | 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] = {
|
1806 | 1813 | ASPEED_PINCTRL_PIN(D4),
|
1807 | 1814 | ASPEED_PINCTRL_PIN(D5),
|
1808 | 1815 | ASPEED_PINCTRL_PIN(D6),
|
| 1816 | + ASPEED_PINCTRL_PIN(D7), |
1809 | 1817 | ASPEED_PINCTRL_PIN(E1),
|
1810 | 1818 | ASPEED_PINCTRL_PIN(E11),
|
1811 | 1819 | ASPEED_PINCTRL_PIN(E12),
|
@@ -2073,6 +2081,7 @@ static const struct aspeed_pin_group aspeed_g6_groups[] = {
|
2073 | 2081 | ASPEED_PINCTRL_GROUP(SALT9G1),
|
2074 | 2082 | ASPEED_PINCTRL_GROUP(SD1),
|
2075 | 2083 | ASPEED_PINCTRL_GROUP(SD2),
|
| 2084 | + ASPEED_PINCTRL_GROUP(PCIERC1), |
2076 | 2085 | ASPEED_PINCTRL_GROUP(EMMCG1),
|
2077 | 2086 | ASPEED_PINCTRL_GROUP(EMMCG4),
|
2078 | 2087 | ASPEED_PINCTRL_GROUP(EMMCG8),
|
@@ -2314,6 +2323,7 @@ static const struct aspeed_pin_function aspeed_g6_functions[] = {
|
2314 | 2323 | ASPEED_PINCTRL_FUNC(SPI2),
|
2315 | 2324 | ASPEED_PINCTRL_FUNC(SPI2CS1),
|
2316 | 2325 | ASPEED_PINCTRL_FUNC(SPI2CS2),
|
| 2326 | + ASPEED_PINCTRL_FUNC(PCIERC1), |
2317 | 2327 | ASPEED_PINCTRL_FUNC(TACH0),
|
2318 | 2328 | ASPEED_PINCTRL_FUNC(TACH1),
|
2319 | 2329 | ASPEED_PINCTRL_FUNC(TACH10),
|
|
0 commit comments