2013-06-23 15:50:49 +00:00
|
|
|
From 5dad33f0c1dd0b1605df6571e3493799106f36ee Mon Sep 17 00:00:00 2001
|
2013-04-25 19:02:42 +00:00
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Fri, 12 Apr 2013 22:12:09 +0200
|
2013-06-23 15:50:49 +00:00
|
|
|
Subject: [PATCH 107/164] MIPS: ralink: rename gpio_pinmux to rt_gpio_pinmux
|
2013-04-25 19:02:42 +00:00
|
|
|
|
|
|
|
|
Add proper namespacing to the variable.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Patchwork: http://patchwork.linux-mips.org/patch/5171/
|
|
|
|
|
---
|
|
|
|
|
arch/mips/ralink/common.h | 2 +-
|
|
|
|
|
arch/mips/ralink/rt305x.c | 2 +-
|
|
|
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/arch/mips/ralink/common.h
|
|
|
|
|
+++ b/arch/mips/ralink/common.h
|
|
|
|
|
@@ -24,7 +24,7 @@ struct ralink_pinmux {
|
|
|
|
|
int uart_shift;
|
|
|
|
|
void (*wdt_reset)(void);
|
|
|
|
|
};
|
|
|
|
|
-extern struct ralink_pinmux gpio_pinmux;
|
|
|
|
|
+extern struct ralink_pinmux rt_gpio_pinmux;
|
|
|
|
|
|
|
|
|
|
struct ralink_soc_info {
|
|
|
|
|
unsigned char sys_type[RAMIPS_SYS_TYPE_LEN];
|
|
|
|
|
--- a/arch/mips/ralink/rt305x.c
|
|
|
|
|
+++ b/arch/mips/ralink/rt305x.c
|
|
|
|
|
@@ -114,7 +114,7 @@ void rt305x_wdt_reset(void)
|
|
|
|
|
rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-struct ralink_pinmux gpio_pinmux = {
|
|
|
|
|
+struct ralink_pinmux rt_gpio_pinmux = {
|
|
|
|
|
.mode = mode_mux,
|
|
|
|
|
.uart = uart_mux,
|
|
|
|
|
.uart_shift = RT305X_GPIO_MODE_UART0_SHIFT,
|
