ramips: various mt7688 pinmux fixes

Signed-off-by: John Crispin <blogic@openwrt.org>

Backport of r46474

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@47101 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 13 insertions, 11 deletions

diff --git a/target/linux/ramips/patches-3.18/0026-MIPS-ralink-add-mt7628an-support.patch b/target/linux/ramips/patches-3.18/0026-MIPS-ralink-add-mt7628an-support.patch
index cdfb4c0f62..c622a12ea7 100644
--- a/target/linux/ramips/patches-3.18/0026-MIPS-ralink-add-mt7628an-support.patch
+++ b/target/linux/ramips/patches-3.18/0026-MIPS-ralink-add-mt7628an-support.patch
@@ -71,31 +71,31 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  };
  
 +static struct rt2880_pmx_func pwm1_grp_mt7628[] = {
-+	FUNC("sdcx", 3, 19, 1),
++	FUNC("sdxc", 3, 19, 1),
 +	FUNC("utif", 2, 19, 1),
 +	FUNC("gpio", 1, 19, 1),
 +	FUNC("pwm", 0, 19, 1),
 +};
 +
 +static struct rt2880_pmx_func pwm0_grp_mt7628[] = {
-+	FUNC("sdcx", 3, 18, 1),
++	FUNC("sdxc", 3, 18, 1),
 +	FUNC("utif", 2, 18, 1),
 +	FUNC("gpio", 1, 18, 1),
 +	FUNC("pwm", 0, 18, 1),
 +};
 +
 +static struct rt2880_pmx_func uart2_grp_mt7628[] = {
-+	FUNC("sdcx", 3, 20, 2),
++	FUNC("sdxc", 3, 20, 2),
 +	FUNC("pwm", 2, 20, 2),
 +	FUNC("gpio", 1, 20, 2),
-+	FUNC("uart", 0, 20, 2),
++	FUNC("uart2", 0, 20, 2),
 +};
 +
 +static struct rt2880_pmx_func uart1_grp_mt7628[] = {
-+	FUNC("sdcx", 3, 45, 2),
++	FUNC("sdxc", 3, 45, 2),
 +	FUNC("pwm", 2, 45, 2),
 +	FUNC("gpio", 1, 45, 2),
-+	FUNC("uart", 0, 45, 2),
++	FUNC("uart1", 0, 45, 2),
 +};
 +
 +static struct rt2880_pmx_func i2c_grp_mt7628[] = {
@@ -107,21 +107,21 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 +static struct rt2880_pmx_func refclk_grp_mt7628[] = { FUNC("reclk", 0, 36, 1) };
 +static struct rt2880_pmx_func perst_grp_mt7628[] = { FUNC("perst", 0, 37, 1) };
-+static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 15, 38) };
++static struct rt2880_pmx_func wdt_grp_mt7628[] = { FUNC("wdt", 0, 38, 1) };
 +static struct rt2880_pmx_func spi_grp_mt7628[] = { FUNC("spi", 0, 7, 4) };
 +
 +static struct rt2880_pmx_func sd_mode_grp_mt7628[] = {
 +	FUNC("jtag", 3, 22, 8),
 +	FUNC("utif", 2, 22, 8),
 +	FUNC("gpio", 1, 22, 8),
-+	FUNC("sdcx", 0, 22, 8),
++	FUNC("sdxc", 0, 22, 8),
 +};
 +
 +static struct rt2880_pmx_func uart0_grp_mt7628[] = {
 +	FUNC("-", 3, 12, 2),
 +	FUNC("-", 2, 12, 2),
 +	FUNC("gpio", 1, 12, 2),
-+	FUNC("uart", 0, 12, 2),
++	FUNC("uart0", 0, 12, 2),
 +};
 +
 +static struct rt2880_pmx_func i2s_grp_mt7628[] = {
@@ -172,7 +172,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 +static struct rt2880_pmx_group mt7628an_pinmux_data[] = {
 +	GRP_G("pmw1", pwm1_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_PWM1),
-+	GRP_G("pmw1", pwm0_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_PWM0),
++	GRP_G("pmw0", pwm0_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_PWM0),
 +	GRP_G("uart2", uart2_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_UART2),
 +	GRP_G("uart1", uart1_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_UART1),
 +	GRP_G("i2c", i2c_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_I2C),
@@ -248,13 +248,15 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  #undef RFRAC
  #undef RINT
  #undef RFMT
-@@ -339,12 +473,11 @@ void __init ralink_clk_init(void)
+@@ -339,12 +473,13 @@ void __init ralink_clk_init(void)
  	ralink_clk_add("cpu", cpu_rate);
  	ralink_clk_add("10000100.timer", periph_rate);
  	ralink_clk_add("10000120.watchdog", periph_rate);
 -	ralink_clk_add("10000500.uart", periph_rate);
  	ralink_clk_add("10000b00.spi", sys_rate);
  	ralink_clk_add("10000c00.uartlite", periph_rate);
++ 	ralink_clk_add("10000d00.uart1", periph_rate);
++ 	ralink_clk_add("10000e00.uart2", periph_rate);
  	ralink_clk_add("10180000.wmac", xtal_rate);
  
 -	if (IS_ENABLED(CONFIG_USB)) {