ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch]

This patch introduces common.[ch] which are used only in the
arch/arm/mach-exynos/ directory. The common.c file merges
the cpu.c, init.c, irq-combiner.c and irq-eint.c files which
are used commonly on EXYNOS SoCs and the common.h file replaces
with plat/exynos4.h file.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 1 insertions, 11 deletions

diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index 058541d45af0..d1829860a0ec 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -149,7 +149,6 @@
 #define S3C_PA_WDT                      EXYNOS4_PA_WATCHDOG
 #define S3C_PA_UART                     EXYNOS4_PA_UART
 
-#define S5P_PA_CHIPID                   EXYNOS4_PA_CHIPID
 #define S5P_PA_EHCI                     EXYNOS4_PA_EHCI
 #define S5P_PA_FIMC0                    EXYNOS4_PA_FIMC0
 #define S5P_PA_FIMC1                    EXYNOS4_PA_FIMC1
@@ -166,26 +165,17 @@
 #define S5P_PA_ONENAND_DMA              EXYNOS4_PA_ONENAND_DMA
 #define S5P_PA_SDO                      EXYNOS4_PA_SDO
 #define S5P_PA_SDRAM                    EXYNOS4_PA_SDRAM
-#define S5P_PA_SROMC                    EXYNOS4_PA_SROMC
-#define S5P_PA_SYSCON                   EXYNOS4_PA_SYSCON
-#define S5P_PA_TIMER                    EXYNOS4_PA_TIMER
 #define S5P_PA_VP                       EXYNOS4_PA_VP
 
 #define SAMSUNG_PA_ADC                  EXYNOS4_PA_ADC
 #define SAMSUNG_PA_ADC1                 EXYNOS4_PA_ADC1
 #define SAMSUNG_PA_KEYPAD               EXYNOS4_PA_KEYPAD
 
-#define EXYNOS_PA_COMBINER              EXYNOS4_PA_COMBINER
-#define EXYNOS_PA_GIC_CPU               EXYNOS4_PA_GIC_CPU
-#define EXYNOS_PA_GIC_DIST              EXYNOS4_PA_GIC_DIST
-#define EXYNOS_PA_PMU                   EXYNOS4_PA_PMU
-#define EXYNOS_PA_SYSTIMER              EXYNOS4_PA_SYSTIMER
-
 /* Compatibility UART */
 
 #define S3C_VA_UARTx(x)                 (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
 
-#define S5P_PA_UART(x)                  (S3C_PA_UART + ((x) * S3C_UART_OFFSET))
+#define S5P_PA_UART(x)                  (EXYNOS4_PA_UART + ((x) * S3C_UART_OFFSET))
 #define S5P_PA_UART0                    S5P_PA_UART(0)
 #define S5P_PA_UART1                    S5P_PA_UART(1)
 #define S5P_PA_UART2                    S5P_PA_UART(2)