Skip to content

Commit 9979346

Browse files
johnydhuanglinusw
authored andcommitted
pinctrl: aspeed-g6: Fix I3C3/I3C4 pinmux configuration
The documentation to configure I3C3/FSI1 and I3C4/FSI2 was initially unclear. Fixes: 58dc52a ("pinctrl: aspeed: Add AST2600 pinmux support") Signed-off-by: Johnny Huang <[email protected]> [AJ: Tweak commit message, resolve rebase conflicts] Signed-off-by: Andrew Jeffery <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Joel Stanley <[email protected]> Signed-off-by: Linus Walleij <[email protected]>
1 parent b178f91 commit 9979346

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,18 +1513,14 @@ FUNC_GROUP_DECL(VB, Y1, Y2, Y3, Y4);
15131513
* following 4 pins
15141514
*/
15151515
#define AF25 244
1516-
SIG_EXPR_LIST_DECL_SEMG(AF25, I3C3SCL, I3C3, I3C3, SIG_DESC_SET(SCU438, 20),
1517-
SIG_DESC_SET(SCU4D8, 20));
1518-
SIG_EXPR_LIST_DECL_SESG(AF25, FSI1CLK, FSI1, SIG_DESC_CLEAR(SCU438, 20),
1519-
SIG_DESC_SET(SCU4D8, 20));
1516+
SIG_EXPR_LIST_DECL_SEMG(AF25, I3C3SCL, I3C3, I3C3, SIG_DESC_SET(SCU438, 20));
1517+
SIG_EXPR_LIST_DECL_SESG(AF25, FSI1CLK, FSI1, SIG_DESC_SET(SCU4D8, 20));
15201518
PIN_DECL_(AF25, SIG_EXPR_LIST_PTR(AF25, I3C3SCL),
15211519
SIG_EXPR_LIST_PTR(AF25, FSI1CLK));
15221520

15231521
#define AE26 245
1524-
SIG_EXPR_LIST_DECL_SEMG(AE26, I3C3SDA, I3C3, I3C3, SIG_DESC_SET(SCU438, 21),
1525-
SIG_DESC_SET(SCU4D8, 21));
1526-
SIG_EXPR_LIST_DECL_SESG(AE26, FSI1DATA, FSI1, SIG_DESC_CLEAR(SCU438, 21),
1527-
SIG_DESC_SET(SCU4D8, 21));
1522+
SIG_EXPR_LIST_DECL_SEMG(AE26, I3C3SDA, I3C3, I3C3, SIG_DESC_SET(SCU438, 21));
1523+
SIG_EXPR_LIST_DECL_SESG(AE26, FSI1DATA, FSI1, SIG_DESC_SET(SCU4D8, 21));
15281524
PIN_DECL_(AE26, SIG_EXPR_LIST_PTR(AE26, I3C3SDA),
15291525
SIG_EXPR_LIST_PTR(AE26, FSI1DATA));
15301526

@@ -1533,18 +1529,14 @@ FUNC_DECL_2(I3C3, HVI3C3, I3C3);
15331529
FUNC_GROUP_DECL(FSI1, AF25, AE26);
15341530

15351531
#define AE25 246
1536-
SIG_EXPR_LIST_DECL_SEMG(AE25, I3C4SCL, I3C4, I3C4, SIG_DESC_SET(SCU438, 22),
1537-
SIG_DESC_SET(SCU4D8, 22));
1538-
SIG_EXPR_LIST_DECL_SESG(AE25, FSI2CLK, FSI2, SIG_DESC_CLEAR(SCU438, 22),
1539-
SIG_DESC_SET(SCU4D8, 22));
1532+
SIG_EXPR_LIST_DECL_SEMG(AE25, I3C4SCL, I3C4, I3C4, SIG_DESC_SET(SCU438, 22));
1533+
SIG_EXPR_LIST_DECL_SESG(AE25, FSI2CLK, FSI2, SIG_DESC_SET(SCU4D8, 22));
15401534
PIN_DECL_(AE25, SIG_EXPR_LIST_PTR(AE25, I3C4SCL),
15411535
SIG_EXPR_LIST_PTR(AE25, FSI2CLK));
15421536

15431537
#define AF24 247
1544-
SIG_EXPR_LIST_DECL_SEMG(AF24, I3C4SDA, I3C4, I3C4, SIG_DESC_SET(SCU438, 23),
1545-
SIG_DESC_SET(SCU4D8, 23));
1546-
SIG_EXPR_LIST_DECL_SESG(AF24, FSI2DATA, FSI2, SIG_DESC_CLEAR(SCU438, 23),
1547-
SIG_DESC_SET(SCU4D8, 23));
1538+
SIG_EXPR_LIST_DECL_SEMG(AF24, I3C4SDA, I3C4, I3C4, SIG_DESC_SET(SCU438, 23));
1539+
SIG_EXPR_LIST_DECL_SESG(AF24, FSI2DATA, FSI2, SIG_DESC_SET(SCU4D8, 23));
15481540
PIN_DECL_(AF24, SIG_EXPR_LIST_PTR(AF24, I3C4SDA),
15491541
SIG_EXPR_LIST_PTR(AF24, FSI2DATA));
15501542

0 commit comments

Comments
 (0)