evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This patch moves mach-s3c2412/cpufreq driver into mach-s3c24xx/
and removes arch/arm/mach-s3c2412/ directory in kernel.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Kukjin Kim 2013-01-21 15:24:34 -08:00
parent c896ba8883
commit dbb8fd34c4
7 changed files with 12 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/Kconfig
View file

@ -1095,7 +1095,6 @@ source "arch/arm/plat-spear/Kconfig"
source "arch/arm/mach-s3c24xx/Kconfig" source "arch/arm/mach-s3c24xx/Kconfig"
if ARCH_S3C24XX if ARCH_S3C24XX
source "arch/arm/mach-s3c2412/Kconfig"
source "arch/arm/mach-s3c2440/Kconfig" source "arch/arm/mach-s3c2440/Kconfig"
endif endif

2
arch/arm/Makefile
View file

@ -173,7 +173,7 @@ machine-$(CONFIG_ARCH_PRIMA2) += prima2
machine-$(CONFIG_ARCH_PXA) += pxa machine-$(CONFIG_ARCH_PXA) += pxa
machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_REALVIEW) += realview
machine-$(CONFIG_ARCH_RPC) += rpc machine-$(CONFIG_ARCH_RPC) += rpc
machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2412 s3c2440 machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2440
machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx
machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0
machine-$(CONFIG_ARCH_S5PC100) += s5pc100 machine-$(CONFIG_ARCH_S5PC100) += s5pc100

13
arch/arm/mach-s3c2412/Kconfig
View file

@ -1,13 +0,0 @@
# Copyright 2007 Simtec Electronics
#
# Licensed under GPLv2
# Note, the S3C2412 IOtiming support is in plat-s3c24xx
config S3C2412_CPUFREQ
bool
depends on CPU_FREQ_S3C24XX && CPU_S3C2412
default y
select S3C2412_IOTIMING
help
CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.

12
arch/arm/mach-s3c2412/Makefile
View file

@ -1,12 +0,0 @@
# arch/arm/mach-s3c2412/Makefile
#
# Copyright 2007 Simtec Electronics
#
# Licensed under GPLv2
obj-y :=
obj-m :=
obj-n :=
obj- :=
obj-$(CONFIG_S3C2412_CPUFREQ) += cpu-freq.o

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

@ -280,6 +280,14 @@ config CPU_S3C2412_ONLY
!CPU_S3C2443 && CPU_S3C2412 !CPU_S3C2443 && CPU_S3C2412
default y default y
config S3C2412_CPUFREQ
bool
depends on CPU_FREQ_S3C24XX && CPU_S3C2412
default y
select S3C2412_IOTIMING
help
CPU Frequency scaling support for S3C2412 and S3C2413 SoC CPUs.
config S3C2412_DMA config S3C2412_DMA
bool bool
help help

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

@ -23,6 +23,7 @@ obj-$(CONFIG_S3C2410_PLL) += pll-s3c2410.o
obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o
obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o obj-$(CONFIG_CPU_S3C2412) += s3c2412.o irq-s3c2412.o clock-s3c2412.o
obj-$(CONFIG_S3C2412_CPUFREQ) += cpufreq-s3c2412.o
obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o
obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o
obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o

6
arch/arm/mach-s3c2412/cpu-freq.c → arch/arm/mach-s3c24xx/cpufreq-s3c2412.c
View file

@ -1,5 +1,4 @@
/* linux/arch/arm/mach-s3c2412/cpu-freq.c /*
*
* Copyright 2008 Simtec Electronics * Copyright 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>
@ -111,7 +110,7 @@ static int s3c2412_cpufreq_calcdivs(struct s3c_cpufreq_config *cfg)
return 0; return 0;
invalid: invalid:
return -EINVAL; return -EINVAL;
} }
@ -255,5 +254,4 @@ static int s3c2412_cpufreq_init(void)
{ {
return subsys_interface_register(&s3c2412_cpufreq_interface); return subsys_interface_register(&s3c2412_cpufreq_interface);
} }
arch_initcall(s3c2412_cpufreq_init); arch_initcall(s3c2412_cpufreq_init);