summaryrefslogtreecommitdiff
path: root/include/asm-mips
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-03-27 11:46:38 -0500
committerWolfgang Denk <wd@denx.de>2008-04-13 17:13:46 -0700
commite99ccb488181d012248c6be30b2093e950319fc5 (patch)
tree3c9fefb4d458a349912aeb2ff548088a21101600 /include/asm-mips
parent20a14a42a25f72e379f38460b8a8484667536795 (diff)
Introduce phys_size_t and move phys_addr_t into asm/types.h
Also add CONFIG_PHYS_64BIT on powerpc to deal with 32-bit ppc's that have larger physical addresses like 44x, 85xx, and 86xx. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r--include/asm-mips/io.h2
-rw-r--r--include/asm-mips/types.h8
2 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index e27d1f159d..7137072ce4 100644
--- a/include/asm-mips/io.h
+++ b/include/asm-mips/io.h
@@ -470,8 +470,6 @@ static inline void sync(void)
* that can be used to access the memory range with the caching
* properties specified by "flags".
*/
-typedef unsigned long phys_addr_t;
-
#define MAP_NOCACHE (0)
#define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0)
diff --git a/include/asm-mips/types.h b/include/asm-mips/types.h
index f49a2176af..d4bb85999b 100644
--- a/include/asm-mips/types.h
+++ b/include/asm-mips/types.h
@@ -78,8 +78,16 @@ typedef unsigned long long u64;
#if (defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) \
|| defined(CONFIG_64BIT)
typedef u64 dma_addr_t;
+
+typedef u64 phys_addr_t;
+typedef u64 phys_size_t;
+
#else
typedef u32 dma_addr_t;
+
+typedef u32 phys_addr_t;
+typedef u32 phys_size_t;
+
#endif
typedef u64 dma64_addr_t;