summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2008-07-13 23:37:56 +0900
committerRalf Baechle <ralf@linux-mips.org>2008-07-15 18:44:38 +0100
commit4c642f3f5e9f3f1a2fcce2c3fa1a94bf80142202 (patch)
treec4ec77d34ec82e5144b728ef9d4e368a2c833fec /arch
parent6e68665e51b9937b132a990b9ae7f04118e64688 (diff)
downloadop-kernel-dev-4c642f3f5e9f3f1a2fcce2c3fa1a94bf80142202.zip
op-kernel-dev-4c642f3f5e9f3f1a2fcce2c3fa1a94bf80142202.tar.gz
[MIPS] TXx9: rename asm-mips/mach-jmr3927 to asm-mips/mach-tx39xx
Rename mach-jmr3927 directory to more proper name to make adding other platforms easier. Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/Makefile2
-rw-r--r--arch/mips/txx9/generic/setup.c10
-rw-r--r--arch/mips/txx9/jmr3927/setup.c4
3 files changed, 13 insertions, 3 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index c4a3098..3564533 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -548,7 +548,7 @@ all-$(CONFIG_SNI_RM) := vmlinux.ecoff
# Common TXx9
#
core-$(CONFIG_MACH_TX39XX) += arch/mips/txx9/generic/
-cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-jmr3927
+cflags-$(CONFIG_MACH_TX39XX) += -Iinclude/asm-mips/mach-tx39xx
load-$(CONFIG_MACH_TX39XX) += 0xffffffff80050000
core-$(CONFIG_MACH_TX49XX) += arch/mips/txx9/generic/
cflags-$(CONFIG_MACH_TX49XX) += -Iinclude/asm-mips/mach-tx49xx
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 517828e..452cb9e 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -200,3 +200,13 @@ asmlinkage void plat_irq_dispatch(void)
else
spurious_interrupt();
}
+
+/* see include/asm-mips/mach-tx39xx/mangle-port.h, for example. */
+#ifdef NEEDS_TXX9_SWIZZLE_ADDR_B
+static unsigned long __swizzle_addr_none(unsigned long port)
+{
+ return port;
+}
+unsigned long (*__swizzle_addr_b)(unsigned long port) = __swizzle_addr_none;
+EXPORT_SYMBOL(__swizzle_addr_b);
+#endif
diff --git a/arch/mips/txx9/jmr3927/setup.c b/arch/mips/txx9/jmr3927/setup.c
index 43a8dad..61edc4a 100644
--- a/arch/mips/txx9/jmr3927/setup.c
+++ b/arch/mips/txx9/jmr3927/setup.c
@@ -315,7 +315,7 @@ static void __init tx3927_setup(void)
}
/* This trick makes rtc-ds1742 driver usable as is. */
-unsigned long __swizzle_addr_b(unsigned long port)
+static unsigned long jmr3927_swizzle_addr_b(unsigned long port)
{
if ((port & 0xffff0000) != JMR3927_IOC_NVRAMB_ADDR)
return port;
@@ -326,7 +326,6 @@ unsigned long __swizzle_addr_b(unsigned long port)
return port | 1;
#endif
}
-EXPORT_SYMBOL(__swizzle_addr_b);
static int __init jmr3927_rtc_init(void)
{
@@ -361,6 +360,7 @@ static int __init jmr3927_wdt_init(void)
static void __init jmr3927_device_init(void)
{
+ __swizzle_addr_b = jmr3927_swizzle_addr_b;
jmr3927_rtc_init();
jmr3927_wdt_init();
}
OpenPOWER on IntegriCloud