diff options
Diffstat (limited to 'include/asm-mips')
-rw-r--r-- | include/asm-mips/mach-tx39xx/ioremap.h (renamed from include/asm-mips/mach-jmr3927/ioremap.h) | 8 | ||||
-rw-r--r-- | include/asm-mips/mach-tx39xx/mangle-port.h (renamed from include/asm-mips/mach-jmr3927/mangle-port.h) | 13 | ||||
-rw-r--r-- | include/asm-mips/mach-tx39xx/war.h (renamed from include/asm-mips/mach-jmr3927/war.h) | 6 |
3 files changed, 16 insertions, 11 deletions
diff --git a/include/asm-mips/mach-jmr3927/ioremap.h b/include/asm-mips/mach-tx39xx/ioremap.h index 29989ff10d66..93c6c04ffda3 100644 --- a/include/asm-mips/mach-jmr3927/ioremap.h +++ b/include/asm-mips/mach-tx39xx/ioremap.h | |||
@@ -1,13 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * include/asm-mips/mach-jmr3927/ioremap.h | 2 | * include/asm-mips/mach-tx39xx/ioremap.h |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or | 4 | * This program is free software; you can redistribute it and/or |
5 | * modify it under the terms of the GNU General Public License | 5 | * modify it under the terms of the GNU General Public License |
6 | * as published by the Free Software Foundation; either version | 6 | * as published by the Free Software Foundation; either version |
7 | * 2 of the License, or (at your option) any later version. | 7 | * 2 of the License, or (at your option) any later version. |
8 | */ | 8 | */ |
9 | #ifndef __ASM_MACH_JMR3927_IOREMAP_H | 9 | #ifndef __ASM_MACH_TX39XX_IOREMAP_H |
10 | #define __ASM_MACH_JMR3927_IOREMAP_H | 10 | #define __ASM_MACH_TX39XX_IOREMAP_H |
11 | 11 | ||
12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
13 | 13 | ||
@@ -35,4 +35,4 @@ static inline int plat_iounmap(const volatile void __iomem *addr) | |||
35 | return (unsigned long)addr >= TXX9_DIRECTMAP_BASE; | 35 | return (unsigned long)addr >= TXX9_DIRECTMAP_BASE; |
36 | } | 36 | } |
37 | 37 | ||
38 | #endif /* __ASM_MACH_JMR3927_IOREMAP_H */ | 38 | #endif /* __ASM_MACH_TX39XX_IOREMAP_H */ |
diff --git a/include/asm-mips/mach-jmr3927/mangle-port.h b/include/asm-mips/mach-tx39xx/mangle-port.h index 11bffcd1043b..ef0b502fd8b7 100644 --- a/include/asm-mips/mach-jmr3927/mangle-port.h +++ b/include/asm-mips/mach-tx39xx/mangle-port.h | |||
@@ -1,7 +1,12 @@ | |||
1 | #ifndef __ASM_MACH_JMR3927_MANGLE_PORT_H | 1 | #ifndef __ASM_MACH_TX39XX_MANGLE_PORT_H |
2 | #define __ASM_MACH_JMR3927_MANGLE_PORT_H | 2 | #define __ASM_MACH_TX39XX_MANGLE_PORT_H |
3 | 3 | ||
4 | extern unsigned long __swizzle_addr_b(unsigned long port); | 4 | #if defined(CONFIG_TOSHIBA_JMR3927) |
5 | extern unsigned long (*__swizzle_addr_b)(unsigned long port); | ||
6 | #define NEEDS_TXX9_SWIZZLE_ADDR_B | ||
7 | #else | ||
8 | #define __swizzle_addr_b(port) (port) | ||
9 | #endif | ||
5 | #define __swizzle_addr_w(port) (port) | 10 | #define __swizzle_addr_w(port) (port) |
6 | #define __swizzle_addr_l(port) (port) | 11 | #define __swizzle_addr_l(port) (port) |
7 | #define __swizzle_addr_q(port) (port) | 12 | #define __swizzle_addr_q(port) (port) |
@@ -15,4 +20,4 @@ extern unsigned long __swizzle_addr_b(unsigned long port); | |||
15 | #define ioswabq(a, x) le64_to_cpu(x) | 20 | #define ioswabq(a, x) le64_to_cpu(x) |
16 | #define __mem_ioswabq(a, x) (x) | 21 | #define __mem_ioswabq(a, x) (x) |
17 | 22 | ||
18 | #endif /* __ASM_MACH_JMR3927_MANGLE_PORT_H */ | 23 | #endif /* __ASM_MACH_TX39XX_MANGLE_PORT_H */ |
diff --git a/include/asm-mips/mach-jmr3927/war.h b/include/asm-mips/mach-tx39xx/war.h index 1ff55fb3fbcb..433814616359 100644 --- a/include/asm-mips/mach-jmr3927/war.h +++ b/include/asm-mips/mach-tx39xx/war.h | |||
@@ -5,8 +5,8 @@ | |||
5 | * | 5 | * |
6 | * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org> | 6 | * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org> |
7 | */ | 7 | */ |
8 | #ifndef __ASM_MIPS_MACH_JMR3927_WAR_H | 8 | #ifndef __ASM_MIPS_MACH_TX39XX_WAR_H |
9 | #define __ASM_MIPS_MACH_JMR3927_WAR_H | 9 | #define __ASM_MIPS_MACH_TX39XX_WAR_H |
10 | 10 | ||
11 | #define R4600_V1_INDEX_ICACHEOP_WAR 0 | 11 | #define R4600_V1_INDEX_ICACHEOP_WAR 0 |
12 | #define R4600_V1_HIT_CACHEOP_WAR 0 | 12 | #define R4600_V1_HIT_CACHEOP_WAR 0 |
@@ -22,4 +22,4 @@ | |||
22 | #define R10000_LLSC_WAR 0 | 22 | #define R10000_LLSC_WAR 0 |
23 | #define MIPS34K_MISSED_ITLB_WAR 0 | 23 | #define MIPS34K_MISSED_ITLB_WAR 0 |
24 | 24 | ||
25 | #endif /* __ASM_MIPS_MACH_JMR3927_WAR_H */ | 25 | #endif /* __ASM_MIPS_MACH_TX39XX_WAR_H */ |