KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: Fix uart2/uart3 pinmux order on MT7621

Browse source 
The uart3 setting in GPIO_MODE register is before the uart2 setting. Also
don't mix uart2 and uart3 function/groups.

Signed-off-by: Sven Eckelmann <sven@open-mesh.com>

SVN-Revision: 46643
This commit is contained in:
John Crispin 2015-08-17 06:15:34 +00:00
parent 27a40c79b0
commit 9ed654e389
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch
View file

@ -555,8 +555,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ +
+#define MT7621_GPIO_MODE_UART1 1 +#define MT7621_GPIO_MODE_UART1 1
+#define MT7621_GPIO_MODE_I2C 2 +#define MT7621_GPIO_MODE_I2C 2
+#define MT7621_GPIO_MODE_UART2 3 +#define MT7621_GPIO_MODE_UART3 3
+#define MT7621_GPIO_MODE_UART3 5 +#define MT7621_GPIO_MODE_UART2 5
+#define MT7621_GPIO_MODE_JTAG 7 +#define MT7621_GPIO_MODE_JTAG 7
+#define MT7621_GPIO_MODE_WDT_MASK 0x3 +#define MT7621_GPIO_MODE_WDT_MASK 0x3
+#define MT7621_GPIO_MODE_WDT_SHIFT 8 +#define MT7621_GPIO_MODE_WDT_SHIFT 8
@ -604,8 +604,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+static struct rt2880_pmx_group mt7621_pinmux_data[] = { +static struct rt2880_pmx_group mt7621_pinmux_data[] = {
+ GRP("uart1", uart1_grp, 1, MT7621_GPIO_MODE_UART1), + GRP("uart1", uart1_grp, 1, MT7621_GPIO_MODE_UART1),
+ GRP("i2c", i2c_grp, 1, MT7621_GPIO_MODE_I2C), + GRP("i2c", i2c_grp, 1, MT7621_GPIO_MODE_I2C),
+ GRP("uart3", uart2_grp, 1, MT7621_GPIO_MODE_UART2), + GRP("uart3", uart3_grp, 1, MT7621_GPIO_MODE_UART3),
+ GRP("uart2", uart3_grp, 1, MT7621_GPIO_MODE_UART3), + GRP("uart2", uart2_grp, 1, MT7621_GPIO_MODE_UART2),
+ GRP("jtag", jtag_grp, 1, MT7621_GPIO_MODE_JTAG), + GRP("jtag", jtag_grp, 1, MT7621_GPIO_MODE_JTAG),
+ GRP_G("wdt", wdt_grp, MT7621_GPIO_MODE_WDT_MASK, + GRP_G("wdt", wdt_grp, MT7621_GPIO_MODE_WDT_MASK,
+ MT7621_GPIO_MODE_WDT_GPIO, MT7621_GPIO_MODE_WDT_SHIFT), + MT7621_GPIO_MODE_WDT_GPIO, MT7621_GPIO_MODE_WDT_SHIFT),