1 --- a/arch/mips/ralink/mt7620.c
2 +++ b/arch/mips/ralink/mt7620.c
3 @@ -107,31 +107,31 @@ static struct rt2880_pmx_group mt7620a_p
6 static struct rt2880_pmx_func pwm1_grp_mt7628[] = {
7 - FUNC("sdcx", 3, 19, 1),
8 + FUNC("sdxc", 3, 19, 1),
9 FUNC("utif", 2, 19, 1),
10 FUNC("gpio", 1, 19, 1),
11 FUNC("pwm", 0, 19, 1),
14 static struct rt2880_pmx_func pwm0_grp_mt7628[] = {
15 - FUNC("sdcx", 3, 18, 1),
16 + FUNC("sdxc", 3, 18, 1),
17 FUNC("utif", 2, 18, 1),
18 FUNC("gpio", 1, 18, 1),
19 FUNC("pwm", 0, 18, 1),
22 static struct rt2880_pmx_func uart2_grp_mt7628[] = {
23 - FUNC("sdcx", 3, 20, 2),
24 + FUNC("sdxc", 3, 20, 2),
25 FUNC("pwm", 2, 20, 2),
26 FUNC("gpio", 1, 20, 2),
27 - FUNC("uart", 0, 20, 2),
28 + FUNC("uart2", 0, 20, 2),
31 static struct rt2880_pmx_func uart1_grp_mt7628[] = {
32 FUNC("sdcx", 3, 45, 2),
33 FUNC("pwm", 2, 45, 2),
34 FUNC("gpio", 1, 45, 2),
35 - FUNC("uart", 0, 45, 2),
36 + FUNC("uart1", 0, 45, 2),
39 static struct rt2880_pmx_func i2c_grp_mt7628[] = {
40 @@ -143,21 +143,21 @@ static struct rt2880_pmx_func i2c_grp_mt
42 static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 36, 1) };
43 static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 37, 1) };
44 -static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 15, 38) };
45 +static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };
46 static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };
48 static struct rt2880_pmx_func sd_mode_grp_mt7628[] = {
49 FUNC("jtag", 3, 22, 8),
50 FUNC("utif", 2, 22, 8),
51 FUNC("gpio", 1, 22, 8),
52 - FUNC("sdcx", 0, 22, 8),
53 + FUNC("sdxc", 0, 22, 8),
56 static struct rt2880_pmx_func uart0_grp_mt7628[] = {
59 FUNC("gpio", 1, 12, 2),
60 - FUNC("uart", 0, 12, 2),
61 + FUNC("uart0", 0, 12, 2),
64 static struct rt2880_pmx_func i2s_grp_mt7628[] = {
65 @@ -438,6 +438,8 @@ void __init ralink_clk_init(void)
66 ralink_clk_add("10000b00.spi", sys_rate);
67 ralink_clk_add("10000b40.spi", sys_rate);
68 ralink_clk_add("10000c00.uartlite", periph_rate);
69 + ralink_clk_add("10000d00.uart1", periph_rate);
70 + ralink_clk_add("10000e00.uart2", periph_rate);
71 ralink_clk_add("10180000.wmac", xtal_rate);
73 if (IS_ENABLED(CONFIG_USB) && is_mt76x8()) {