summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-clps711x/include/mach/syspld.h
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2012-10-10 19:45:31 +0400
committerArnd Bergmann <arnd@arndb.de>2012-10-25 17:22:35 +0200
commit6cb1b145b912721f7a00f3fb5938765b34558b08 (patch)
tree208a150411995cc7ae159c31ea8bd8799272bf2b /arch/arm/mach-clps711x/include/mach/syspld.h
parent36504ac131d14611dded451dd8b9f8426d084111 (diff)
ARM: clps711x: make all virtual addresses definition via one macro
This patch make all virtual addresses definition via one macro. This modification allows to avoid warning "BUG: mapping for 0x80000000 at 0xff000000 out of vmalloc space". Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-clps711x/include/mach/syspld.h')
-rw-r--r--arch/arm/mach-clps711x/include/mach/syspld.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/syspld.h b/arch/arm/mach-clps711x/include/mach/syspld.h
index f7f4c120189..9a433155bf5 100644
--- a/arch/arm/mach-clps711x/include/mach/syspld.h
+++ b/arch/arm/mach-clps711x/include/mach/syspld.h
@@ -23,14 +23,9 @@
#define __ASM_ARCH_SYSPLD_H
#define SYSPLD_PHYS_BASE (0x10000000)
+#define SYSPLD_VIRT_BASE IO_ADDRESS(SYSPLD_PHYS_BASE)
-#ifndef __ASSEMBLY__
-#include <asm/types.h>
-
-#define SYSPLD_REG(type,off) (*(volatile type *)(SYSPLD_BASE + off))
-#else
-#define SYSPLD_REG(type,off) (off)
-#endif
+#define SYSPLD_REG(type, off) (*(volatile type *)(SYSPLD_VIRT_BASE + (off)))
#define PLD_INT SYSPLD_REG(u32, 0x000000)
#define PLD_INT_PENIRQ (1 << 5)