diff options
| author | John Crispin <blogic@openwrt.org> | 2015-08-17 06:15:34 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2015-08-17 06:15:34 +0000 |
| commit | 18e799aa0d13e75e9ddedc427401453772d3c387 (patch) | |
| tree | 1840a3fbb3480417968090cbc3c546044b61d954 /target/linux/ramips | |
| parent | 5ec5bcb83f2533e1aa3647e58e7e80d7a2abd9b5 (diff) | |
| download | master-187ad058-18e799aa0d13e75e9ddedc427401453772d3c387.tar.gz master-187ad058-18e799aa0d13e75e9ddedc427401453772d3c387.tar.bz2 master-187ad058-18e799aa0d13e75e9ddedc427401453772d3c387.zip | |
ramips: Fix uart2/uart3 pinmux order on MT7621
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46643 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch b/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch index 771de12f17..f08ecb0326 100644 --- a/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch +++ b/target/linux/ramips/patches-3.18/0012-MIPS-ralink-add-MT7621-support.patch @@ -555,8 +555,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + +#define MT7621_GPIO_MODE_UART1 1 +#define MT7621_GPIO_MODE_I2C 2 -+#define MT7621_GPIO_MODE_UART2 3 -+#define MT7621_GPIO_MODE_UART3 5 ++#define MT7621_GPIO_MODE_UART3 3 ++#define MT7621_GPIO_MODE_UART2 5 +#define MT7621_GPIO_MODE_JTAG 7 +#define MT7621_GPIO_MODE_WDT_MASK 0x3 +#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[] = { + GRP("uart1", uart1_grp, 1, MT7621_GPIO_MODE_UART1), + GRP("i2c", i2c_grp, 1, MT7621_GPIO_MODE_I2C), -+ GRP("uart3", uart2_grp, 1, MT7621_GPIO_MODE_UART2), -+ GRP("uart2", uart3_grp, 1, MT7621_GPIO_MODE_UART3), ++ GRP("uart3", 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_G("wdt", wdt_grp, MT7621_GPIO_MODE_WDT_MASK, + MT7621_GPIO_MODE_WDT_GPIO, MT7621_GPIO_MODE_WDT_SHIFT), |