From 7ae12473a6e023c3bff0161cc8adb7823fabb21c Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 12 Apr 2013 12:45:27 +0200 Subject: [PATCH] --- yaml --- r: 375147 b: refs/heads/master c: eb63875c2821cf125f133fa3292e7591dca7c7d5 h: refs/heads/master i: 375145: b844c92f930da48f893a4a61525ca57a783b00a1 375143: a52acda3703424ace14c6587fb4a0927bf77f944 v: v3 --- [refs] | 2 +- trunk/arch/mips/ralink/common.h | 1 + trunk/arch/mips/ralink/rt305x.c | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ed9cbbbb6fe2..c2aed40623bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 946fda6f2a980d9964206191ec121774800eb030 +refs/heads/master: eb63875c2821cf125f133fa3292e7591dca7c7d5 diff --git a/trunk/arch/mips/ralink/common.h b/trunk/arch/mips/ralink/common.h index bebd14930bd9..299119b294ca 100644 --- a/trunk/arch/mips/ralink/common.h +++ b/trunk/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/trunk/arch/mips/ralink/rt305x.c b/trunk/arch/mips/ralink/rt305x.c index 5b42078b7341..6aa3cb1a8fc5 100644 --- a/trunk/arch/mips/ralink/rt305x.c +++ b/trunk/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, };