openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: S3C24XX: Move mach-s3c2440/ cpufreq driver into mach-s3c24xx/ 

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Kukjin Kim 2013-01-21 15:34:19 -08:00
parent dbb8fd34c4
commit 5aa93c0ab8
5 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-s3c2440/Kconfig
View File

@ -2,14 +2,6 @@
# #
# Licensed under GPLv2 # Licensed under GPLv2
config S3C2440_CPUFREQ
bool "S3C2440/S3C2442 CPU Frequency scaling support"
depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
default y
select S3C2410_CPUFREQ_UTILS
help
CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
config S3C2440_XTAL_12000000 config S3C2440_XTAL_12000000
bool bool
help help

2
arch/arm/mach-s3c2440/Makefile
View File

@ -9,7 +9,5 @@ obj-m :=
obj-n := obj-n :=
obj- := obj- :=
obj-$(CONFIG_S3C2440_CPUFREQ) += s3c2440-cpufreq.o
obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o obj-$(CONFIG_S3C2440_PLL_12000000) += s3c2440-pll-12000000.o
obj-$(CONFIG_S3C2440_PLL_16934400) += s3c2440-pll-16934400.o obj-$(CONFIG_S3C2440_PLL_16934400) += s3c2440-pll-16934400.o

8
arch/arm/mach-s3c24xx/Kconfig
View File

@ -387,6 +387,14 @@ endif # CPU_S3C2416
if CPU_S3C2440 if CPU_S3C2440
config S3C2440_CPUFREQ
bool "S3C2440/S3C2442 CPU Frequency scaling support"
depends on CPU_FREQ_S3C24XX && (CPU_S3C2440 || CPU_S3C2442)
default y
select S3C2410_CPUFREQ_UTILS
help
CPU Frequency scaling support for S3C2440 and S3C2442 SoC CPUs.
config S3C2440_DMA config S3C2440_DMA
bool bool
help help

1
arch/arm/mach-s3c24xx/Makefile
View File

@ -34,6 +34,7 @@ obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o
obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o
obj-$(CONFIG_CPU_S3C2442) += s3c2442.o obj-$(CONFIG_CPU_S3C2442) += s3c2442.o
obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o obj-$(CONFIG_CPU_S3C244X) += s3c244x.o irq-s3c244x.o clock-s3c244x.o
obj-$(CONFIG_S3C2440_CPUFREQ) += cpufreq-s3c2440.o
obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o
obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o obj-$(CONFIG_CPU_S3C2443) += s3c2443.o irq-s3c2443.o clock-s3c2443.o

4
arch/arm/mach-s3c2440/s3c2440-cpufreq.c → arch/arm/mach-s3c24xx/cpufreq-s3c2440.c
View File

@ -1,5 +1,4 @@
/* linux/arch/arm/plat-s3c24xx/s3c2440-cpufreq.c /*
*
* Copyright (c) 2006-2009 Simtec Electronics * Copyright (c) 2006-2009 Simtec Electronics
* http://armlinux.simtec.co.uk/ * http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
@ -310,5 +309,4 @@ static int s3c2442_cpufreq_init(void)
{ {
return subsys_interface_register(&s3c2442_cpufreq_interface); return subsys_interface_register(&s3c2442_cpufreq_interface);
} }
subsys_initcall(s3c2442_cpufreq_init); subsys_initcall(s3c2442_cpufreq_init);