From 7c3ed95c2550416ed82ad7c809522d025e487917 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Thu, 30 Jul 2009 23:23:35 +0100 Subject: [PATCH] --- yaml --- r: 160935 b: refs/heads/master c: e13cf03eaae3792442c401860910d40f33c89a33 h: refs/heads/master i: 160933: 13f1ecd6257e841809b4a120b39a68f438dd9687 160931: 9c23b3f220fff5878c9234202635e6a3a40e4e13 160927: 0fc0a118c4f34016b3011dfd76076c82a49a6a39 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c6400/include/mach/map.h | 4 ++-- trunk/arch/arm/plat-s3c/include/plat/map-base.h | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4bfa2aa67435..d605883571fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78ddb2785980fc01b129c3547463266cae9c6ca9 +refs/heads/master: e13cf03eaae3792442c401860910d40f33c89a33 diff --git a/trunk/arch/arm/mach-s3c6400/include/mach/map.h b/trunk/arch/arm/mach-s3c6400/include/mach/map.h index 5057d9948d35..e02e6c38a396 100644 --- a/trunk/arch/arm/mach-s3c6400/include/mach/map.h +++ b/trunk/arch/arm/mach-s3c6400/include/mach/map.h @@ -49,7 +49,7 @@ #define S3C64XX_PA_IIC1 (0x7F00F000) #define S3C64XX_PA_GPIO (0x7F008000) -#define S3C64XX_VA_GPIO S3C_ADDR(0x00500000) +#define S3C64XX_VA_GPIO S3C_ADDR_CPU(0x00000000) #define S3C64XX_SZ_GPIO SZ_4K #define S3C64XX_PA_SDRAM (0x50000000) @@ -57,7 +57,7 @@ #define S3C64XX_PA_VIC1 (0x71300000) #define S3C64XX_PA_MODEM (0x74108000) -#define S3C64XX_VA_MODEM S3C_ADDR(0x00600000) +#define S3C64XX_VA_MODEM S3C_ADDR_CPU(0x00100000) #define S3C64XX_PA_USBHOST (0x74300000) diff --git a/trunk/arch/arm/plat-s3c/include/plat/map-base.h b/trunk/arch/arm/plat-s3c/include/plat/map-base.h index b84289d32a54..250be311c85b 100644 --- a/trunk/arch/arm/plat-s3c/include/plat/map-base.h +++ b/trunk/arch/arm/plat-s3c/include/plat/map-base.h @@ -32,9 +32,15 @@ #define S3C_VA_IRQ S3C_ADDR(0x00000000) /* irq controller(s) */ #define S3C_VA_SYS S3C_ADDR(0x00100000) /* system control */ -#define S3C_VA_MEM S3C_ADDR(0x00200000) /* system control */ +#define S3C_VA_MEM S3C_ADDR(0x00200000) /* memory control */ #define S3C_VA_TIMER S3C_ADDR(0x00300000) /* timer block */ #define S3C_VA_WATCHDOG S3C_ADDR(0x00400000) /* watchdog */ #define S3C_VA_UART S3C_ADDR(0x01000000) /* UART */ +/* This is used for the CPU specific mappings that may be needed, so that + * they do not need to directly used S3C_ADDR() and thus make it easier to + * modify the space for mapping. + */ +#define S3C_ADDR_CPU(x) S3C_ADDR(0x00500000 + (x)) + #endif /* __ASM_PLAT_MAP_H */