Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / arch / arm / mach-exynos4 / include / mach / map.h

diff --git a/arch/arm/mach-exynos4/include/mach/map.h b/arch/arm/mach-exynos4/include/mach/map.h
index 0009e77..d32296d 100644 (file)
--- a/arch/arm/mach-exynos4/include/mach/map.h
+++ b/arch/arm/mach-exynos4/include/mach/map.h
@@ -57,12 +57,14 @@
 
 #define EXYNOS4_PA_DMC0                        0x10400000
 
-#define EXYNOS4_PA_COMBINER            0x10448000
+#define EXYNOS4_PA_COMBINER            0x10440000
+
+#define EXYNOS4_PA_GIC_CPU             0x10480000
+#define EXYNOS4_PA_GIC_DIST            0x10490000
+#define EXYNOS4_GIC_BANK_OFFSET                0x8000
 
 #define EXYNOS4_PA_COREPERI            0x10500000
-#define EXYNOS4_PA_GIC_CPU             0x10500100
 #define EXYNOS4_PA_TWD                 0x10500600
-#define EXYNOS4_PA_GIC_DIST            0x10501000
 #define EXYNOS4_PA_L2CC                        0x10502000
 
 #define EXYNOS4_PA_MDMA                        0x10810000
@@ -93,7 +95,10 @@
 #define EXYNOS4_PA_MIPI_CSIS0          0x11880000
 #define EXYNOS4_PA_MIPI_CSIS1          0x11890000
 
+#define EXYNOS4_PA_FIMD0               0x11C00000
+
 #define EXYNOS4_PA_HSMMC(x)            (0x12510000 + ((x) * 0x10000))
+#define EXYNOS4_PA_DWMCI               0x12550000
 
 #define EXYNOS4_PA_SATA                        0x12560000
 #define EXYNOS4_PA_SATAPHY             0x125D0000
@@ -103,11 +108,15 @@
 
 #define EXYNOS4_PA_EHCI                        0x12580000
 #define EXYNOS4_PA_HSPHY               0x125B0000
+#define EXYNOS4_PA_MFC                 0x13400000
 
 #define EXYNOS4_PA_UART                        0x13800000
 
 #define EXYNOS4_PA_IIC(x)              (0x13860000 + ((x) * 0x10000))
 
+#define EXYNOS4_PA_ADC                 0x13910000
+#define EXYNOS4_PA_ADC1                        0x13911000
+
 #define EXYNOS4_PA_AC97                        0x139A0000
 
 #define EXYNOS4_PA_SPDIF               0x139B0000
@@ -130,6 +139,8 @@
 #define S3C_PA_IIC5                    EXYNOS4_PA_IIC(5)
 #define S3C_PA_IIC6                    EXYNOS4_PA_IIC(6)
 #define S3C_PA_IIC7                    EXYNOS4_PA_IIC(7)
+#define SAMSUNG_PA_ADC                 EXYNOS4_PA_ADC
+#define SAMSUNG_PA_ADC1                        EXYNOS4_PA_ADC1
 #define S3C_PA_RTC                     EXYNOS4_PA_RTC
 #define S3C_PA_WDT                     EXYNOS4_PA_WATCHDOG
 
@@ -140,10 +151,12 @@
 #define S5P_PA_FIMC3                   EXYNOS4_PA_FIMC3
 #define S5P_PA_MIPI_CSIS0              EXYNOS4_PA_MIPI_CSIS0
 #define S5P_PA_MIPI_CSIS1              EXYNOS4_PA_MIPI_CSIS1
+#define S5P_PA_FIMD0                   EXYNOS4_PA_FIMD0
 #define S5P_PA_ONENAND                 EXYNOS4_PA_ONENAND
 #define S5P_PA_ONENAND_DMA             EXYNOS4_PA_ONENAND_DMA
 #define S5P_PA_SDRAM                   EXYNOS4_PA_SDRAM
 #define S5P_PA_SROMC                   EXYNOS4_PA_SROMC
+#define S5P_PA_MFC                     EXYNOS4_PA_MFC
 #define S5P_PA_SYSCON                  EXYNOS4_PA_SYSCON
 #define S5P_PA_TIMER                   EXYNOS4_PA_TIMER
 #define S5P_PA_EHCI                    EXYNOS4_PA_EHCI