ARM: S3C24XX: Move mach-s3c2410/ cpufreq into mach-s3c24xx/

Basically, the cpufreq driver for s3c2410 should be implemented into
drivers/cpufreq, but we don't need to keep the mach-s3c2410 directory.
So this patch moves current cpufreq driver into mach-s3c24xx/.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Kukjin Kim 2013-01-21 14:51:08 -08:00
parent 3a71c5c375
commit 98713e401f
5 changed files with 10 additions and 13 deletions

View File

@ -4,13 +4,6 @@
# cpu frequency scaling support # cpu frequency scaling support
config S3C2410_CPUFREQ
bool
depends on CPU_FREQ_S3C24XX && CPU_S3C2410
select S3C2410_CPUFREQ_UTILS
help
CPU Frequency scaling support for S3C2410
config S3C2410_PLLTABLE config S3C2410_PLLTABLE
bool bool
depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL

View File

@ -9,6 +9,5 @@ obj-m :=
obj-n := obj-n :=
obj- := obj- :=
obj-$(CONFIG_S3C2410_CPUFREQ) += cpu-freq.o
obj-$(CONFIG_S3C2410_PLLTABLE) += pll.o obj-$(CONFIG_S3C2410_PLLTABLE) += pll.o

View File

@ -127,6 +127,13 @@ config S3C2410_PM
if CPU_S3C2410 if CPU_S3C2410
config S3C2410_CPUFREQ
bool
depends on CPU_FREQ_S3C24XX && CPU_S3C2410
select S3C2410_CPUFREQ_UTILS
help
CPU Frequency scaling support for S3C2410
config S3C24XX_SIMTEC_NOR config S3C24XX_SIMTEC_NOR
bool bool
help help

View File

@ -17,6 +17,7 @@ obj- :=
obj-y += common.o obj-y += common.o
obj-$(CONFIG_CPU_S3C2410) += s3c2410.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o
obj-$(CONFIG_S3C2410_CPUFREQ) += cpufreq-s3c2410.o
obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o
obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o

View File

@ -1,5 +1,4 @@
/* linux/arch/arm/mach-s3c2410/cpu-freq.c /*
*
* Copyright (c) 2006-2008 Simtec Electronics * Copyright (c) 2006-2008 Simtec Electronics
* http://armlinux.simtec.co.uk/ * http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk> * Ben Dooks <ben@simtec.co.uk>
@ -81,7 +80,7 @@ static int s3c2410_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg)
cfg->divs.p_divisor = pdiv; cfg->divs.p_divisor = pdiv;
cfg->divs.h_divisor = hdiv; cfg->divs.h_divisor = hdiv;
return 0 ; return 0;
} }
static struct s3c_cpufreq_info s3c2410_cpufreq_info = { static struct s3c_cpufreq_info s3c2410_cpufreq_info = {
@ -131,7 +130,6 @@ static int __init s3c2410_cpufreq_init(void)
{ {
return subsys_interface_register(&s3c2410_cpufreq_interface); return subsys_interface_register(&s3c2410_cpufreq_interface);
} }
arch_initcall(s3c2410_cpufreq_init); arch_initcall(s3c2410_cpufreq_init);
static int s3c2410a_cpufreq_add(struct device *dev, static int s3c2410a_cpufreq_add(struct device *dev,
@ -159,5 +157,4 @@ static int __init s3c2410a_cpufreq_init(void)
{ {
return subsys_interface_register(&s3c2410a_cpufreq_interface); return subsys_interface_register(&s3c2410a_cpufreq_interface);
} }
arch_initcall(s3c2410a_cpufreq_init); arch_initcall(s3c2410a_cpufreq_init);