aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/Makefile2
-rw-r--r--arch/arm/mach-s3c2412/Kconfig13
-rw-r--r--arch/arm/mach-s3c2412/Makefile12
-rw-r--r--arch/arm/mach-s3c24xx/Kconfig8
-rw-r--r--arch/arm/mach-s3c24xx/Makefile1
-rw-r--r--arch/arm/mach-s3c24xx/cpufreq-s3c2412.c (renamed from arch/arm/mach-s3c2412/cpu-freq.c)6
7 files changed, 12 insertions, 31 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f95ba14ae3d0..5d566bfedd06 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1095,7 +1095,6 @@ source "arch/arm/plat-spear/Kconfig"
1095 1095
1096source "arch/arm/mach-s3c24xx/Kconfig" 1096source "arch/arm/mach-s3c24xx/Kconfig"
1097if ARCH_S3C24XX 1097if ARCH_S3C24XX
1098source "arch/arm/mach-s3c2412/Kconfig"
1099source "arch/arm/mach-s3c2440/Kconfig" 1098source "arch/arm/mach-s3c2440/Kconfig"
1100endif 1099endif
1101 1100
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 30c443c406f3..29e8faecc096 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PRIMA2) += prima2
173machine-$(CONFIG_ARCH_PXA) += pxa 173machine-$(CONFIG_ARCH_PXA) += pxa
174machine-$(CONFIG_ARCH_REALVIEW) += realview 174machine-$(CONFIG_ARCH_REALVIEW) += realview
175machine-$(CONFIG_ARCH_RPC) += rpc 175machine-$(CONFIG_ARCH_RPC) += rpc
176machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2412 s3c2440 176machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2440
177machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx 177machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx
178machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 178machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0
179machine-$(CONFIG_ARCH_S5PC100) += s5pc100 179machine-$(CONFIG_ARCH_S5PC100) += s5pc100
diff --git a/arch/arm/mach-s3c2412/Kconfig b/arch/arm/mach-s3c2412/Kconfig
deleted file mode 100644
index 495f6928cbaa..000000000000
--- a/arch/arm/mach-s3c2412/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
1# Copyright 2007 Simtec Electronics
2#
3# Licensed under GPLv2
4
5# Note, the S3C2412 IOtiming support is in plat-s3c24xx
6
7config S3C2412_CPUFREQ
8 bool
9 depends on CPU_FREQ_S3C24XX && CPU_S3C2412
10 default y
11 select S3C2412_IOTIMING
12 help
13 CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
diff --git a/arch/arm/mach-s3c2412/Makefile b/arch/arm/mach-s3c2412/Makefile
deleted file mode 100644
index 41a6c279fb2f..000000000000
--- a/arch/arm/mach-s3c2412/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
1# arch/arm/mach-s3c2412/Makefile
2#
3# Copyright 2007 Simtec Electronics
4#
5# Licensed under GPLv2
6
7obj-y :=
8obj-m :=
9obj-n :=
10obj- :=
11
12obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 5cc740c07457..f1d3951fc102 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -280,6 +280,14 @@ config CPU_S3C2412_ONLY
280 !CPU_S3C2443 && CPU_S3C2412 280 !CPU_S3C2443 && CPU_S3C2412
281 default y 281 default y
282 282
283config S3C2412_CPUFREQ
284 bool
285 depends on CPU_FREQ_S3C24XX && CPU_S3C2412
286 default y
287 select S3C2412_IOTIMING
288 help
289 CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
290
283config S3C2412_DMA 291config S3C2412_DMA
284 bool 292 bool
285 help 293 help
diff --git a/arch/arm/mach-s3c24xx/Makefile b/arch/arm/mach-s3c24xx/Makefile
index ecace54fd1d5..0f042d180fb8 100644
--- a/arch/arm/mach-s3c24xx/Makefile
+++ b/arch/arm/mach-s3c24xx/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o
23obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o 23obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o
24 24
25obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o 25obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o
26obj-$(CONFIG_S3C2412_CPUFREQ) += cpufreq-s3c2412.o
26obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o 27obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o
27obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o 28obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o
28obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o 29obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o
diff --git a/arch/arm/mach-s3c2412/cpu-freq.c b/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c
index 125be7d5fa60..c8f05f309eee 100644
--- a/arch/arm/mach-s3c2412/cpu-freq.c
+++ b/arch/arm/mach-s3c24xx/cpufreq-s3c2412.c
@@ -1,5 +1,4 @@
1/* linux/arch/arm/mach-s3c2412/cpu-freq.c 1/*
2 *
3 * Copyright 2008 Simtec Electronics 2 * Copyright 2008 Simtec Electronics
4 * http://armlinux.simtec.co.uk/ 3 * http://armlinux.simtec.co.uk/
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
@@ -111,7 +110,7 @@ static int s3c2412_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg)
111 110
112 return 0; 111 return 0;
113 112
114 invalid: 113invalid:
115 return -EINVAL; 114 return -EINVAL;
116} 115}
117 116
@@ -255,5 +254,4 @@ static int s3c2412_cpufreq_init(void)
255{ 254{
256 return subsys_interface_register(&s3c2412_cpufreq_interface); 255 return subsys_interface_register(&s3c2412_cpufreq_interface);
257} 256}
258
259arch_initcall(s3c2412_cpufreq_init); 257arch_initcall(s3c2412_cpufreq_init);