aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2010-01-25 14:24:04 +0900
committerBen Dooks <ben-linux@fluff.org>2010-01-27 09:50:11 +0900
commite96b234b7e9d24e50528287b881ca229b7f094b8 (patch)
treecb0ec48e8884b79cc1d01fa7a2ec0b23ec673906
parent159a3ddd6c0521b4ab81697b2cf06a903a854862 (diff)
downloadmrst-s0i3-test-e96b234b7e9d24e50528287b881ca229b7f094b8.tar.gz
mrst-s0i3-test-e96b234b7e9d24e50528287b881ca229b7f094b8.tar.xz
mrst-s0i3-test-e96b234b7e9d24e50528287b881ca229b7f094b8.zip
ARM: S5P6440: Move CPU specific code in plat-s5p to machine directory
The s5p6440-clock.c and s5p6440-init.c code in the plat-s5p is specific to s5p6440 SoC based systems. So these files are being moved to the machine directory of s5p6440. And these files are renamed in the machine directory. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r--arch/arm/mach-s5p6440/Kconfig2
-rw-r--r--arch/arm/mach-s5p6440/Makefile2
-rw-r--r--arch/arm/mach-s5p6440/clock.c (renamed from arch/arm/plat-s5p/s5p6440-clock.c)2
-rw-r--r--arch/arm/mach-s5p6440/gpio.c (renamed from arch/arm/mach-s5p6440/s5p6440-gpio.c)2
-rw-r--r--arch/arm/mach-s5p6440/init.c (renamed from arch/arm/plat-s5p/s5p6440-init.c)4
-rw-r--r--arch/arm/plat-s5p/Kconfig16
-rw-r--r--arch/arm/plat-s5p/Makefile5
7 files changed, 6 insertions, 27 deletions
diff --git a/arch/arm/mach-s5p6440/Kconfig b/arch/arm/mach-s5p6440/Kconfig
index 3aa246244dc..4c29ff8b07d 100644
--- a/arch/arm/mach-s5p6440/Kconfig
+++ b/arch/arm/mach-s5p6440/Kconfig
@@ -9,8 +9,6 @@ if ARCH_S5P6440
config CPU_S5P6440
bool
- select CPU_S5P6440_INIT
- select CPU_S5P6440_CLOCK
help
Enable S5P6440 CPU support
diff --git a/arch/arm/mach-s5p6440/Makefile b/arch/arm/mach-s5p6440/Makefile
index a79b13011ed..1ad894b1d3a 100644
--- a/arch/arm/mach-s5p6440/Makefile
+++ b/arch/arm/mach-s5p6440/Makefile
@@ -12,7 +12,7 @@ obj- :=
# Core support for S5P6440 system
-obj-$(CONFIG_CPU_S5P6440) += cpu.o s5p6440-gpio.o
+obj-$(CONFIG_CPU_S5P6440) += cpu.o init.o clock.o gpio.o
# machine support
diff --git a/arch/arm/plat-s5p/s5p6440-clock.c b/arch/arm/mach-s5p6440/clock.c
index 2f412f8c121..b2672e16e7a 100644
--- a/arch/arm/plat-s5p/s5p6440-clock.c
+++ b/arch/arm/mach-s5p6440/clock.c
@@ -1,4 +1,4 @@
-/* linux/arch/arm/plat-s5p/s5p6440-clock.c
+/* linux/arch/arm/mach-s5p6440/clock.c
*
* Copyright (c) 2009 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/arch/arm/mach-s5p6440/s5p6440-gpio.c b/arch/arm/mach-s5p6440/gpio.c
index 742264c29f2..b0ea741177a 100644
--- a/arch/arm/mach-s5p6440/s5p6440-gpio.c
+++ b/arch/arm/mach-s5p6440/gpio.c
@@ -1,4 +1,4 @@
-/* arch/arm/mach-s5p6440/s5p6440-gpio.c
+/* arch/arm/mach-s5p6440/gpio.c
*
* Copyright (c) 2009 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/arch/arm/plat-s5p/s5p6440-init.c b/arch/arm/mach-s5p6440/init.c
index 90178256cc2..a1f3727e402 100644
--- a/arch/arm/plat-s5p/s5p6440-init.c
+++ b/arch/arm/mach-s5p6440/init.c
@@ -1,8 +1,10 @@
-/* linux/arch/arm/plat-s5p/s5p6440-init.c
+/* linux/arch/arm/mach-s5p6440/init.c
*
* Copyright (c) 2009 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
+ * S5P6440 - Init support
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index e7c31e7060e..fca6dade9fd 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -24,19 +24,3 @@ config PLAT_S5P
select SAMSUNG_IRQ_UART
help
Base platform code for Samsung's S5P series SoC.
-
-if (PLAT_S5P && ARCH_S5P6440)
-
-# Configuration options shared by all S5P64XX implementations
-
-config CPU_S5P6440_INIT
- bool
- help
- Initialisation code for the S5P6440.
-
-config CPU_S5P6440_CLOCK
- bool
- help
- Clock support code for the S5P6440.
-
-endif
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 92b64745054..a7c54b332d2 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -17,8 +17,3 @@ obj-y += cpu.o
obj-y += clock.o
obj-y += irq.o
obj-y += setup-i2c0.o
-
-# CPU support
-
-obj-$(CONFIG_CPU_S5P6440_INIT) += s5p6440-init.o
-obj-$(CONFIG_CPU_S5P6440_CLOCK) += s5p6440-clock.o