mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 16:15:11 +00:00
Code Issues Releases Wiki Activity

MIPS: ralink: add uart mask to struct ralink_pinmux

Browse source 
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/
This commit is contained in:
John Crispin 2013-04-12 12:45:27 +02:00 committed by Ralf Baechle
parent 946fda6f2a
commit eb63875c28
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/mips/ralink/common.h
View file

@ -22,6 +22,7 @@ struct ralink_pinmux {
struct ralink_pinmux_grp *mode; struct ralink_pinmux_grp *mode;
struct ralink_pinmux_grp *uart; struct ralink_pinmux_grp *uart;
int uart_shift; int uart_shift;
u32 uart_mask;
void (*wdt_reset)(void); void (*wdt_reset)(void);
struct ralink_pinmux_grp *pci; struct ralink_pinmux_grp *pci;
int pci_shift; int pci_shift;

5
arch/mips/ralink/rt305x.c
View file

@ -91,12 +91,12 @@ static struct ralink_pinmux_grp uart_mux[] = {
.name = "gpio uartf", .name = "gpio uartf",
.mask = RT305X_GPIO_MODE_GPIO_UARTF, .mask = RT305X_GPIO_MODE_GPIO_UARTF,
.gpio_first = RT305X_GPIO_7, .gpio_first = RT305X_GPIO_7,
.gpio_last = RT305X_GPIO_14, .gpio_last = RT305X_GPIO_10,
}, { }, {
.name = "gpio i2s", .name = "gpio i2s",
.mask = RT305X_GPIO_MODE_GPIO_I2S, .mask = RT305X_GPIO_MODE_GPIO_I2S,
.gpio_first = RT305X_GPIO_7, .gpio_first = RT305X_GPIO_7,
.gpio_last = RT305X_GPIO_14, .gpio_last = RT305X_GPIO_10,
}, { }, {
.name = "gpio", .name = "gpio",
.mask = RT305X_GPIO_MODE_GPIO, .mask = RT305X_GPIO_MODE_GPIO,
@ -118,6 +118,7 @@ struct ralink_pinmux rt_gpio_pinmux = {
.mode = mode_mux, .mode = mode_mux,
.uart = uart_mux, .uart = uart_mux,
.uart_shift = RT305X_GPIO_MODE_UART0_SHIFT, .uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
.uart_mask = RT305X_GPIO_MODE_UART0_MASK,
.wdt_reset = rt305x_wdt_reset, .wdt_reset = rt305x_wdt_reset,
}; };