Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2

[cascardo/linux.git] / arch / arm / mach-exynos / include / mach / map.h

diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 151b4a4..e737331 100644 (file)
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -89,7 +89,7 @@
 #define EXYNOS4_PA_L2CC                        0x10502000
 
 #define EXYNOS4_PA_MDMA0               0x10810000
-#define EXYNOS4_PA_MDMA1               0x12840000
+#define EXYNOS4_PA_MDMA1               0x12850000
 #define EXYNOS4_PA_PDMA0               0x12680000
 #define EXYNOS4_PA_PDMA1               0x12690000
 #define EXYNOS5_PA_MDMA0               0x10800000
@@ -121,6 +121,11 @@
 #define EXYNOS4_PA_SYSMMU_MFC_L                0x13620000
 #define EXYNOS4_PA_SYSMMU_MFC_R                0x13630000
 
+#define EXYNOS5_PA_GSC0                        0x13E00000
+#define EXYNOS5_PA_GSC1                        0x13E10000
+#define EXYNOS5_PA_GSC2                        0x13E20000
+#define EXYNOS5_PA_GSC3                        0x13E30000
+
 #define EXYNOS5_PA_SYSMMU_MDMA1                0x10A40000
 #define EXYNOS5_PA_SYSMMU_SSS          0x10A50000
 #define EXYNOS5_PA_SYSMMU_2D           0x10A60000
@@ -131,7 +136,6 @@
 #define EXYNOS5_PA_SYSMMU_JPEG         0x11F20000
 #define EXYNOS5_PA_SYSMMU_IOP          0x12360000
 #define EXYNOS5_PA_SYSMMU_RTIC         0x12370000
-#define EXYNOS5_PA_SYSMMU_GPS          0x12630000
 #define EXYNOS5_PA_SYSMMU_ISP          0x13260000
 #define EXYNOS5_PA_SYSMMU_DRC          0x12370000
 #define EXYNOS5_PA_SYSMMU_SCALERC      0x13280000
@@ -173,6 +177,10 @@
 
 #define EXYNOS4_PA_HSMMC(x)            (0x12510000 + ((x) * 0x10000))
 #define EXYNOS4_PA_DWMCI               0x12550000
+#define EXYNOS5_PA_DWMCI0              0x12200000
+#define EXYNOS5_PA_DWMCI1              0x12210000
+#define EXYNOS5_PA_DWMCI2              0x12220000
+#define EXYNOS5_PA_DWMCI3              0x12230000
 
 #define EXYNOS4_PA_HSOTG               0x12480000
 #define EXYNOS4_PA_USB_HSPHY           0x125B0000