diff options
| author | John Crispin <blogic@openwrt.org> | 2013-04-12 12:45:27 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-08 01:19:09 +0200 |
| commit | eb63875c2821cf125f133fa3292e7591dca7c7d5 (patch) | |
| tree | 4b150a680cd0fbcbc17a9fff037536d340ae382a /arch/mips/ralink | |
| parent | MIPS: ralink: add pci group to struct ralink_pinmux (diff) | |
| download | linux-eb63875c2821cf125f133fa3292e7591dca7c7d5.tar.xz linux-eb63875c2821cf125f133fa3292e7591dca7c7d5.zip | |
MIPS: ralink: add uart mask to struct ralink_pinmux
Add a field for the uart muxing mask and set it inside the rt305x setup code.
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/5744/
Diffstat (limited to 'arch/mips/ralink')
| -rw-r--r-- | arch/mips/ralink/common.h | 1 | ||||
| -rw-r--r-- | arch/mips/ralink/rt305x.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h index bebd14930bd9..299119b294ca 100644 --- a/arch/mips/ralink/common.h +++ b/arch/mips/ralink/common.h @@ -22,6 +22,7 @@ struct ralink_pinmux { struct ralink_pinmux_grp *mode; struct ralink_pinmux_grp *uart; int uart_shift; + u32 uart_mask; void (*wdt_reset)(void); struct ralink_pinmux_grp *pci; int pci_shift; diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c index 5b42078b7341..6aa3cb1a8fc5 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux[] = { .name = "gpio uartf", .mask = RT305X_GPIO_MODE_GPIO_UARTF, .gpio_first = RT305X_GPIO_7, - .gpio_last = RT305X_GPIO_14, + .gpio_last = RT305X_GPIO_10, }, { .name = "gpio i2s", .mask = RT305X_GPIO_MODE_GPIO_I2S, .gpio_first = RT305X_GPIO_7, - .gpio_last = RT305X_GPIO_14, + .gpio_last = RT305X_GPIO_10, }, { .name = "gpio", .mask = RT305X_GPIO_MODE_GPIO, @@ -118,6 +118,7 @@ struct ralink_pinmux rt_gpio_pinmux = { .mode = mode_mux, .uart = uart_mux, .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT, + .uart_mask = RT305X_GPIO_MODE_UART0_MASK, .wdt_reset = rt305x_wdt_reset, }; |