Skip to content

Commit 1550583

Browse files
johnydhuanglinusw
authored andcommitted
pinctrl: aspeed-g6: Fix UART13 group pinmux
When UART13G1 is set the pinmux configuration in SCU4B8 for UART13G0 should be cleared. Fixes: 58dc52a ("pinctrl: aspeed: Add AST2600 pinmux support") Signed-off-by: Johnny Huang <[email protected]> [AJ: Tweak commit message] 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 c136d4c commit 1550583

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,13 +1262,13 @@ GROUP_DECL(SPI1, AB11, AC11, AA11);
12621262
#define AD11 206
12631263
SIG_EXPR_LIST_DECL_SEMG(AD11, SPI1DQ2, QSPI1, SPI1, SIG_DESC_SET(SCU438, 14));
12641264
SIG_EXPR_LIST_DECL_SEMG(AD11, TXD13, UART13G1, UART13,
1265-
SIG_DESC_SET(SCU438, 14));
1265+
SIG_DESC_CLEAR(SCU4B8, 2), SIG_DESC_SET(SCU4D8, 14));
12661266
PIN_DECL_2(AD11, GPIOZ6, SPI1DQ2, TXD13);
12671267

12681268
#define AF10 207
12691269
SIG_EXPR_LIST_DECL_SEMG(AF10, SPI1DQ3, QSPI1, SPI1, SIG_DESC_SET(SCU438, 15));
12701270
SIG_EXPR_LIST_DECL_SEMG(AF10, RXD13, UART13G1, UART13,
1271-
SIG_DESC_SET(SCU438, 15));
1271+
SIG_DESC_CLEAR(SCU4B8, 3), SIG_DESC_SET(SCU4D8, 15));
12721272
PIN_DECL_2(AF10, GPIOZ7, SPI1DQ3, RXD13);
12731273

12741274
GROUP_DECL(QSPI1, AB11, AC11, AA11, AD11, AF10);

0 commit comments

Comments
 (0)