diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-17 11:05:43 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-17 11:05:43 +0900 |
| commit | 4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a (patch) | |
| tree | 7fcf37a6f0c08708ccd31825415627ccb44067c3 /arch/arm/mach-s3c64xx/include/mach/map.h | |
| parent | 07bc0a5b46a17107be942876dc53d536feaecf6e (diff) | |
| parent | ae79ac5c0ccb8789df661b8aa4b16bac4243f43d (diff) | |
| download | blackbird-op-linux-4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a.tar.gz blackbird-op-linux-4c59de052e7167a3bcf3f32c5ea4c9a5ef07386a.zip | |
Merge branch 'next/topic-plat-samsung-1' into next-samsung-cleanup
Diffstat (limited to 'arch/arm/mach-s3c64xx/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/map.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h index a1f13f02c841..23a1d71e4d53 100644 --- a/arch/arm/mach-s3c64xx/include/mach/map.h +++ b/arch/arm/mach-s3c64xx/include/mach/map.h @@ -16,6 +16,7 @@ #define __ASM_ARCH_MAP_H __FILE__ #include <plat/map-base.h> +#include <plat/map-s3c.h> /* * Post-mux Chip Select Regions Xm0CSn_ @@ -83,7 +84,6 @@ #define S3C64XX_PA_IIC1 (0x7F00F000) #define S3C64XX_PA_GPIO (0x7F008000) -#define S3C64XX_VA_GPIO S3C_ADDR_CPU(0x00000000) #define S3C64XX_SZ_GPIO SZ_4K #define S3C64XX_PA_SDRAM (0x50000000) @@ -94,16 +94,10 @@ #define S3C64XX_PA_VIC1 (0x71300000) #define S3C64XX_PA_MODEM (0x74108000) -#define S3C64XX_VA_MODEM S3C_ADDR_CPU(0x00100000) #define S3C64XX_PA_USBHOST (0x74300000) #define S3C64XX_PA_USB_HSPHY (0x7C100000) -#define S3C64XX_VA_USB_HSPHY S3C_ADDR_CPU(0x00200000) - -/* place VICs close together */ -#define VA_VIC0 (S3C_VA_IRQ + 0x00) -#define VA_VIC1 (S3C_VA_IRQ + 0x10000) /* compatibiltiy defines. */ #define S3C_PA_TIMER S3C64XX_PA_TIMER @@ -119,7 +113,6 @@ #define S3C_PA_FB S3C64XX_PA_FB #define S3C_PA_USBHOST S3C64XX_PA_USBHOST #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG -#define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY #define S3C_PA_RTC S3C64XX_PA_RTC #define S3C_PA_WDT S3C64XX_PA_WATCHDOG |
