ARM: SAMSUNG: move hr timer for common s5p into plat-samsung

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 8e45c8b15d1b4722cee9350a4f7155f2268b1a8a..795790df7404fb85732242d62ecdd47bbfcd1310 100644 (file)
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -23,12 +23,6 @@ config PLAT_S5P
        help
          Base platform code for Samsung's S5P series SoC.
 
-config S5P_HRT
-       bool
-       select SAMSUNG_DEV_PWM
-       help
-         Use the High Resolution timer support
-
 config S5P_DEV_UART
        def_bool y
        depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)

diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index c81106f5d7c1019696a533c52963ab17057151a5..0a2ce38b179f873f9a82c350f7fc11dfa0ac2ab5 100644 (file)
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -10,10 +10,6 @@ obj-m                                :=
 obj-n                          := dummy.o
 obj-                           :=
 
-# Core files
-
-obj-$(CONFIG_S5P_HRT)          += s5p-time.o
-
 # devices
 
 obj-$(CONFIG_S5P_DEV_UART)     += dev-uart.o

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 218462361e313829ffb88e9edd2e17ff9cd685c9..1922413f2ee7e546e23383d54244c6aadcd3fd9c 100644 (file)
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -50,6 +50,14 @@ config S3C_LOWLEVEL_UART_PORT
          this configuration should be between zero and two. The port
          must have been initialised by the boot-loader before use.
 
+# timer options
+
+config S5P_HRT
+       bool
+       select SAMSUNG_DEV_PWM
+       help
+         Use the High Resolution timer support
+
 # clock options
 
 config SAMSUNG_CLKSRC

diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index caa6f9af1f3d5e0757d838b88ad3a8a1a1c00b02..6217c41e62601aa833e25b8d16e4249534fd6332 100644 (file)
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -13,6 +13,8 @@ obj-                          :=
 
 obj-y                          += init.o cpu.o
 obj-$(CONFIG_ARCH_USES_GETTIMEOFFSET)   += time.o
+obj-$(CONFIG_S5P_HRT)          += s5p-time.o
+
 obj-y                          += clock.o
 obj-y                          += pwm-clock.o
 

diff --git a/arch/arm/plat-s5p/s5p-time.c b/arch/arm/plat-samsung/s5p-time.c
similarity index 99%
rename from arch/arm/plat-s5p/s5p-time.c
rename to arch/arm/plat-samsung/s5p-time.c
index 17c0a2c58dfd92aa73e07a9a73bbdad2cb1ef05b..028b6e877eb9d4afbbe64f90bc82e43d28e1eb38 100644 (file)
--- a/arch/arm/plat-s5p/s5p-time.c
+++ b/arch/arm/plat-samsung/s5p-time.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/plat-s5p/s5p-time.c
- *
+/*
  * Copyright (c) 2011 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com/
  *