]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ARM: SAMSUNG: move clock part for common s5p into plat-samsung
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 16 Apr 2012 04:13:29 +0000 (21:13 -0700)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 22:01:17 +0000 (07:01 +0900)
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/plat-s5p/Makefile
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/s5p-clock.c [moved from arch/arm/plat-s5p/clock.c with 99% similarity]

index 4953d50707be79514b6302b96f7a7e868a2ee989..83152108af3de3a214b9702e8f12f186cfd8b44e 100644 (file)
@@ -12,7 +12,6 @@ obj-                          :=
 
 # Core files
 
-obj-y                          += clock.o
 obj-y                          += irq.o
 obj-$(CONFIG_S5P_EXT_INT)      += irq-eint.o
 obj-$(CONFIG_S5P_GPIO_INT)     += irq-gpioint.o
index 71553f410016057315a51b27c28bca46d8bfd93e..3a48d9de22a88171781340e05fdf21d0460f75fe 100644 (file)
@@ -58,6 +58,11 @@ config SAMSUNG_CLKSRC
          Select the clock code for the clksrc implementation
          used by newer systems such as the S3C64XX.
 
+config S5P_CLOCK
+       def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
+       help
+         Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
+
 # options for IRQ support
 
 config SAMSUNG_IRQ_VIC_TIMER
index 6012366f33cb5ebf42ed978a6e424059a4d62f26..997ce1005700e9f7de913b9d5a0adf4c7afd2d71 100644 (file)
@@ -17,6 +17,7 @@ obj-y                         += clock.o
 obj-y                          += pwm-clock.o
 
 obj-$(CONFIG_SAMSUNG_CLKSRC)   += clock-clksrc.o
+obj-$(CONFIG_S5P_CLOCK)                += s5p-clock.o
 
 obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o
 
similarity index 99%
rename from arch/arm/plat-s5p/clock.c
rename to arch/arm/plat-samsung/s5p-clock.c
index f68a9bb1194807ef193d09e62cdf6d0a9c0ff63b..41d3dfd5dddbe0ab0cfb8818fb15d7edc3b6c9ea 100644 (file)
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/clock.c
- *
+/*
  * Copyright 2009 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *