aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-04-16 00:13:29 -0400
committerKukjin Kim <kgene.kim@samsung.com>2012-05-12 18:01:17 -0400
commitbf46aaeacf728dad9d89ed3d604bf991035dfd77 (patch)
tree0de8266c97f7320e31dcd4d368281104949e23eb
parentbca10b906f8d2e4f177bff047b9d623941e454f7 (diff)
ARM: SAMSUNG: move clock part for common s5p into plat-samsung
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/plat-s5p/Makefile1
-rw-r--r--arch/arm/plat-samsung/Kconfig5
-rw-r--r--arch/arm/plat-samsung/Makefile1
-rw-r--r--arch/arm/plat-samsung/s5p-clock.c (renamed from arch/arm/plat-s5p/clock.c)3
4 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 4953d50707b..83152108af3 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -12,7 +12,6 @@ obj- :=
12 12
13# Core files 13# Core files
14 14
15obj-y += clock.o
16obj-y += irq.o 15obj-y += irq.o
17obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o 16obj-$(CONFIG_S5P_EXT_INT) += irq-eint.o
18obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o 17obj-$(CONFIG_S5P_GPIO_INT) += irq-gpioint.o
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 71553f41001..3a48d9de22a 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -58,6 +58,11 @@ config SAMSUNG_CLKSRC
58 Select the clock code for the clksrc implementation 58 Select the clock code for the clksrc implementation
59 used by newer systems such as the S3C64XX. 59 used by newer systems such as the S3C64XX.
60 60
61config S5P_CLOCK
62 def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
63 help
64 Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
65
61# options for IRQ support 66# options for IRQ support
62 67
63config SAMSUNG_IRQ_VIC_TIMER 68config SAMSUNG_IRQ_VIC_TIMER
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 6012366f33c..997ce100570 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -17,6 +17,7 @@ obj-y += clock.o
17obj-y += pwm-clock.o 17obj-y += pwm-clock.o
18 18
19obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o 19obj-$(CONFIG_SAMSUNG_CLKSRC) += clock-clksrc.o
20obj-$(CONFIG_S5P_CLOCK) += s5p-clock.o
20 21
21obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o 22obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o
22 23
diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-samsung/s5p-clock.c
index f68a9bb1194..41d3dfd5ddd 100644
--- a/arch/arm/plat-s5p/clock.c
+++ b/arch/arm/plat-samsung/s5p-clock.c
@@ -1,5 +1,4 @@
1/* linux/arch/arm/plat-s5p/clock.c 1/*
2 *
3 * Copyright 2009 Samsung Electronics Co., Ltd. 2 * Copyright 2009 Samsung Electronics Co., Ltd.
4 * http://www.samsung.com/ 3 * http://www.samsung.com/
5 * 4 *