diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-08-24 04:25:09 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-09-16 03:38:55 -0400 |
commit | 684653842b65b98538e5d6198998e68c879bd45e (patch) | |
tree | c104c3425f8776477c29fa519eb1bfb7597b800a /arch/arm/mach-exynos4 | |
parent | 54122447bbba20e7538093189b8ad276b959e653 (diff) |
ARM: EXYNOS4: Add support new EXYNOS4212 SoC
This patch adds Samsung EXYNOS4212 SoC support.
The EXYNOS4212 integrates a ARM Cortex A9 multi-core.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos4')
-rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/Makefile | 6 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/cpu.c | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index bee8f77de2ab..0b40289d4f73 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig | |||
@@ -15,6 +15,11 @@ config CPU_EXYNOS4210 | |||
15 | help | 15 | help |
16 | Enable EXYNOS4210 CPU support | 16 | Enable EXYNOS4210 CPU support |
17 | 17 | ||
18 | config SOC_EXYNOS4212 | ||
19 | bool | ||
20 | help | ||
21 | Enable EXYNOS4212 SoC support | ||
22 | |||
18 | config EXYNOS4_MCT | 23 | config EXYNOS4_MCT |
19 | bool | 24 | bool |
20 | default y | 25 | default y |
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile index e3e93ea41385..46244576452a 100644 --- a/arch/arm/mach-exynos4/Makefile +++ b/arch/arm/mach-exynos4/Makefile | |||
@@ -12,8 +12,10 @@ obj- := | |||
12 | 12 | ||
13 | # Core support for EXYNOS4 system | 13 | # Core support for EXYNOS4 system |
14 | 14 | ||
15 | obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o | 15 | obj-$(CONFIG_ARCH_EXYNOS4) += cpu.o init.o clock.o irq-combiner.o |
16 | obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o pmu.o | 16 | obj-$(CONFIG_ARCH_EXYNOS4) += setup-i2c0.o irq-eint.o dma.o pmu.o |
17 | obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o | ||
18 | obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o | ||
17 | obj-$(CONFIG_PM) += pm.o sleep.o | 19 | obj-$(CONFIG_PM) += pm.o sleep.o |
18 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o | 20 | obj-$(CONFIG_CPU_IDLE) += cpuidle.o |
19 | 21 | ||
diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c index 0d281bbe345a..1e1a7a9d2ae7 100644 --- a/arch/arm/mach-exynos4/cpu.c +++ b/arch/arm/mach-exynos4/cpu.c | |||
@@ -241,7 +241,11 @@ static int __init exynos4_l2x0_cache_init(void) | |||
241 | { | 241 | { |
242 | /* TAG, Data Latency Control: 2cycle */ | 242 | /* TAG, Data Latency Control: 2cycle */ |
243 | __raw_writel(0x110, S5P_VA_L2CC + L2X0_TAG_LATENCY_CTRL); | 243 | __raw_writel(0x110, S5P_VA_L2CC + L2X0_TAG_LATENCY_CTRL); |
244 | __raw_writel(0x110, S5P_VA_L2CC + L2X0_DATA_LATENCY_CTRL); | 244 | |
245 | if (soc_is_exynos4210()) | ||
246 | __raw_writel(0x110, S5P_VA_L2CC + L2X0_DATA_LATENCY_CTRL); | ||
247 | else if (soc_is_exynos4212()) | ||
248 | __raw_writel(0x120, S5P_VA_L2CC + L2X0_DATA_LATENCY_CTRL); | ||
245 | 249 | ||
246 | /* L2X0 Prefetch Control */ | 250 | /* L2X0 Prefetch Control */ |
247 | __raw_writel(0x30000007, S5P_VA_L2CC + L2X0_PREFETCH_CTRL); | 251 | __raw_writel(0x30000007, S5P_VA_L2CC + L2X0_PREFETCH_CTRL); |