57 lines
1.7 KiB
Diff
57 lines
1.7 KiB
Diff
From 6e09e0465b342b52ecda583cbc41e6a31c363b3f Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Fri, 12 Apr 2013 12:45:27 +0200
|
|
Subject: [PATCH 26/79] 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/
|
|
---
|
|
arch/mips/ralink/common.h | 1 +
|
|
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 bebd149..299119b 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 5b42078..6aa3cb1 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,
|
|
};
|
|
|
|
--
|
|
1.7.10.4
|
|
|