Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98713e40 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

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: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 3a71c5c3

arch/arm/mach-s3c2410/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -4,13 +4,6 @@ 


# 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

	bool

	depends on S3C2410_CPUFREQ && CPU_FREQ_S3C24XX_PLL

arch/arm/mach-s3c2410/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,6 +9,5 @@ obj-m := 
obj-n				:=

obj-				:=



obj-$(CONFIG_S3C2410_CPUFREQ)	+= cpu-freq.o

obj-$(CONFIG_S3C2410_PLLTABLE)	+= pll.o

arch/arm/mach-s3c24xx/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -127,6 +127,13 @@ config S3C2410_PM 


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

	bool

	help

arch/arm/mach-s3c24xx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj- := 
obj-y				+= common.o



obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o

obj-$(CONFIG_S3C2410_CPUFREQ)	+= cpufreq-s3c2410.o

obj-$(CONFIG_S3C2410_DMA)	+= dma-s3c2410.o

obj-$(CONFIG_S3C2410_PM)	+= pm-s3c2410.o sleep-s3c2410.o

arch/arm/mach-s3c2410/cpu-freq.c→arch/arm/mach-s3c24xx/cpufreq-s3c2410.c

+2 −5
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s3c2410/cpu-freq.c

 *

/*

 * Copyright (c) 2006-2008 Simtec Electronics

 *	http://armlinux.simtec.co.uk/

 *	Ben Dooks <ben@simtec.co.uk>
@@ -131,7 +130,6 @@ static int __init s3c2410_cpufreq_init(void) 
{

	return subsys_interface_register(&s3c2410_cpufreq_interface);

}



arch_initcall(s3c2410_cpufreq_init);



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);

}



arch_initcall(s3c2410a_cpufreq_init);