Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 22:53:34 +0000 (07:53 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 22:53:34 +0000 (07:53 +0900)
1  2 
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/include/mach/irqs.h
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/include/mach/regs-clock.h
arch/arm/plat-samsung/Kconfig

Simple merge
Simple merge
Simple merge
Simple merge
  #define EXYNOS4_PA_MDMA1              0x12840000
  #define EXYNOS4_PA_PDMA0              0x12680000
  #define EXYNOS4_PA_PDMA1              0x12690000
+ #define EXYNOS5_PA_MDMA0              0x10800000
+ #define EXYNOS5_PA_MDMA1              0x11C10000
+ #define EXYNOS5_PA_PDMA0              0x121A0000
+ #define EXYNOS5_PA_PDMA1              0x121B0000
  
  #define EXYNOS4_PA_SYSMMU_MDMA                0x10A40000
 +#define EXYNOS4_PA_SYSMMU_2D_ACP      0x10A40000
  #define EXYNOS4_PA_SYSMMU_SSS         0x10A50000
  #define EXYNOS4_PA_SYSMMU_FIMC0               0x11A20000
  #define EXYNOS4_PA_SYSMMU_FIMC1               0x11A30000
Simple merge