git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
addr-map.h
diff --git
a/arch/arm/mach-pxa/include/mach/addr-map.h
b/arch/arm/mach-pxa/include/mach/addr-map.h
index
f4c0365
..
bbf9df3
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/addr-map.h
+++ b/
arch/arm/mach-pxa/include/mach/addr-map.h
@@
-20,7
+20,7
@@
* Peripheral Bus
*/
#define PERIPH_PHYS 0x40000000
* Peripheral Bus
*/
#define PERIPH_PHYS 0x40000000
-#define PERIPH_VIRT
0xf2000000
+#define PERIPH_VIRT
IOMEM(0xf2000000)
#define PERIPH_SIZE 0x02000000
/*
#define PERIPH_SIZE 0x02000000
/*
@@
-28,21
+28,21
@@
*/
#define PXA2XX_SMEMC_PHYS 0x48000000
#define PXA3XX_SMEMC_PHYS 0x4a000000
*/
#define PXA2XX_SMEMC_PHYS 0x48000000
#define PXA3XX_SMEMC_PHYS 0x4a000000
-#define SMEMC_VIRT
0xf6000000
+#define SMEMC_VIRT
IOMEM(0xf6000000)
#define SMEMC_SIZE 0x00100000
/*
* Dynamic Memory Controller (only on PXA3xx)
*/
#define DMEMC_PHYS 0x48100000
#define SMEMC_SIZE 0x00100000
/*
* Dynamic Memory Controller (only on PXA3xx)
*/
#define DMEMC_PHYS 0x48100000
-#define DMEMC_VIRT
0xf6100000
+#define DMEMC_VIRT
IOMEM(0xf6100000)
#define DMEMC_SIZE 0x00100000
/*
* Internal Memory Controller (PXA27x and later)
*/
#define IMEMC_PHYS 0x58000000
#define DMEMC_SIZE 0x00100000
/*
* Internal Memory Controller (PXA27x and later)
*/
#define IMEMC_PHYS 0x58000000
-#define IMEMC_VIRT
0xfe000000
+#define IMEMC_VIRT
IOMEM(0xfe000000)
#define IMEMC_SIZE 0x00100000
#endif /* __ASM_MACH_ADDR_MAP_H */
#define IMEMC_SIZE 0x00100000
#endif /* __ASM_MACH_ADDR_MAP_H */