This patch simply moves CPUfreq drivers for S5PV210 and EXYNOS4
into drivers/cpufreq directoty. The driver codes were not modified.
Signed-off-by: Donggeun Kim <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
---
arch/arm/mach-exynos4/Makefile | 1 -
arch/arm/mach-s5pv210/Makefile | 1 -
drivers/cpufreq/Makefile | 3 +++
.../cpufreq.c => drivers/cpufreq/exynos4.c | 3 +--
.../cpufreq.c => drivers/cpufreq/s5pv210.c | 3 +--
5 files changed, 5 insertions(+), 6 deletions(-)
rename arch/arm/mach-exynos4/cpufreq.c => drivers/cpufreq/exynos4.c (99%)
rename arch/arm/mach-s5pv210/cpufreq.c => drivers/cpufreq/s5pv210.c (99%)
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index 9be104f..7bf1c01 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -15,7 +15,6 @@ obj- :=
obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o
obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o gpiolib.o irq-eint.o dma.o
obj-$(CONFIG_PM) += pm.o sleep.o
-obj-$(CONFIG_CPU_FREQ) += cpufreq.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 11f1790..435d23e 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -15,7 +15,6 @@ obj- :=
obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o dma.o gpiolib.o
obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o
obj-$(CONFIG_S5PV210_PM) += pm.o sleep.o
-obj-$(CONFIG_CPU_FREQ) += cpufreq.o
# machine support
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index c7f1a6f..92f2222 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -39,3 +39,6 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o
##################################################################################d
+# ARM CPUfreq drivers
+obj-$(CONFIG_CPU_FREQ_S5PV210) += s5pv210.o
+obj-$(CONFIG_CPU_FREQ_EXYNOS4) += exynos4.o
diff --git a/arch/arm/mach-exynos4/cpufreq.c b/drivers/cpufreq/exynos4.c
similarity index 99%
rename from arch/arm/mach-exynos4/cpufreq.c
rename to drivers/cpufreq/exynos4.c
index a1bd258..54025fc 100644
--- a/arch/arm/mach-exynos4/cpufreq.c
+++ b/drivers/cpufreq/exynos4.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-exynos4/cpufreq.c
- *
+/*
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
diff --git a/arch/arm/mach-s5pv210/cpufreq.c b/drivers/cpufreq/s5pv210.c
similarity index 99%
rename from arch/arm/mach-s5pv210/cpufreq.c
rename to drivers/cpufreq/s5pv210.c
index 22046e2..c482fc8 100644
--- a/arch/arm/mach-s5pv210/cpufreq.c
+++ b/drivers/cpufreq/s5pv210.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-s5pv210/cpufreq.c
- *
+/*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
--
1.7.4.1
This patch adds CONFIG_CPU_FREQ_S5PV210 and CONFIG_CPU_FREQ_EXYNOS4
to the machine Kconfig files.
Signed-off-by: Donggeun Kim <[email protected]>
Signed-off-by: Kyungmin Park <[email protected]>
---
arch/arm/mach-exynos4/Kconfig | 7 +++++++
arch/arm/mach-s5pv210/Kconfig | 7 +++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index e849f67..123e5e2 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -91,6 +91,13 @@ config EXYNOS4_SETUP_FIMC
help
Common setup code for the camera interfaces.
+config CPU_FREQ_EXYNOS4
+ bool
+ depends on CPU_FREQ && ARCH_EXYNOS4
+ default y
+ help
+ This enabls the CPUfreq driver for EXYNOS4.
+
# machine support
menu "EXYNOS4 Machines"
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 37b5a97..376e824 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -59,6 +59,13 @@ config S5PV210_SETUP_FIMC
help
Common setup code for the camera interfaces.
+config CPU_FREQ_S5PV210
+ bool
+ depends on CPU_FREQ && CPU_S5PV210
+ default y
+ help
+ This enabls the CPUfreq driver for S5PV210.
+
menu "S5PC110 Machines"
config MACH_AQUILA
--
1.7.4.1
On 05/27/11 01:04, Donggeun Kim wrote:
> This patch adds CONFIG_CPU_FREQ_S5PV210 and CONFIG_CPU_FREQ_EXYNOS4
> to the machine Kconfig files.
>
> Signed-off-by: Donggeun Kim<[email protected]>
> Signed-off-by: Kyungmin Park<[email protected]>
> ---
> arch/arm/mach-exynos4/Kconfig | 7 +++++++
> arch/arm/mach-s5pv210/Kconfig | 7 +++++++
> 2 files changed, 14 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
> index e849f67..123e5e2 100644
> --- a/arch/arm/mach-exynos4/Kconfig
> +++ b/arch/arm/mach-exynos4/Kconfig
> @@ -91,6 +91,13 @@ config EXYNOS4_SETUP_FIMC
> help
> Common setup code for the camera interfaces.
>
> +config CPU_FREQ_EXYNOS4
> + bool
> + depends on CPU_FREQ&& ARCH_EXYNOS4
> + default y
> + help
> + This enabls the CPUfreq driver for EXYNOS4.
> +
> # machine support
>
> menu "EXYNOS4 Machines"
> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
> index 37b5a97..376e824 100644
> --- a/arch/arm/mach-s5pv210/Kconfig
> +++ b/arch/arm/mach-s5pv210/Kconfig
> @@ -59,6 +59,13 @@ config S5PV210_SETUP_FIMC
> help
> Common setup code for the camera interfaces.
>
> +config CPU_FREQ_S5PV210
> + bool
> + depends on CPU_FREQ&& CPU_S5PV210
> + default y
> + help
> + This enabls the CPUfreq driver for S5PV210.
> +
> menu "S5PC110 Machines"
>
> config MACH_AQUILA
Cc'ed Ben Dooks.
No. Please don't add this in arch/arm. If required, they should be
added in drivers/cpufreq/ like x86.
As a note, I'm sorting that out which includes all of Samsung cpufreq
driver.
Dave, could you please see below? If you're ok, will submit remained
others for Samsung cpufreq drivers.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
---
From 137f53472a0ea8ce584adbddfdb6ae645fc5a09c Mon Sep 17 00:00:00 2001
From: Kukjin Kim <[email protected]>
Date: Wed, 1 Jun 2011 12:37:47 -0700
Subject: [PATCH] cpufreq: Add Samsung cpufreq driver compile in Kconfig.arm
According to discussion of the ARM arch subsystem migration,
ARM cpufreq drivers move to drivers/cpufreq. So this patch
adds Kconfig.arm for ARM like x86 and adds Samsung cpufreq
driver compile in there.
As a note didn't add 'default y' on this to build error during
each maintainers' merge. If required, it can be added later.
Cc: Dave Jones <[email protected]>
Signed-off-by: Kukjin Kim <[email protected]>
---
drivers/cpufreq/Kconfig | 5 +++++
drivers/cpufreq/Kconfig.arm | 21 +++++++++++++++++++++
drivers/cpufreq/Makefile | 2 ++
3 files changed, 28 insertions(+), 0 deletions(-)
create mode 100644 drivers/cpufreq/Kconfig.arm
diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig
index 9fb8485..e898215 100644
--- a/drivers/cpufreq/Kconfig
+++ b/drivers/cpufreq/Kconfig
@@ -184,5 +184,10 @@ depends on X86
source "drivers/cpufreq/Kconfig.x86"
endmenu
+menu "ARM CPU frequency scaling drivers"
+depends on ARM
+source "drivers/cpufreq/Kconfig.arm"
+endmenu
+
endif
endmenu
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
new file mode 100644
index 0000000..f2fc3a4
--- /dev/null
+++ b/drivers/cpufreq/Kconfig.arm
@@ -0,0 +1,21 @@
+#
+# ARM CPU Frequency scaling drivers
+#
+
+config ARM_S5PV210_CPUFREQ
+ bool "Samsung S5PV210 and S5PC110"
+ depends on CPU_S5PV210
+ ---help---
+ This adds the CPUFreq driver for Samsung S5PV210 and
+ S5PC110 SoCs.
+
+ If in doubt, say N.
+
+config ARM_EXYNOS4210_CPUFREQ
+ bool "Samsung EXYNOS4210"
+ depends on CPU_EXYNOS4210
+ ---help---
+ This adds the CPUFreq driver for Samsung EXYNOS4210
+ SoC (S5PV310 or S5PC210).
+
+ If in doubt, say N.
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index e2fc2d2..864a27c 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -41,3 +41,5 @@ obj-$(CONFIG_X86_CPUFREQ_NFORCE2) += cpufreq-nforce2.o
# ARM SoC drivers
obj-$(CONFIG_UX500_SOC_DB8500) += db8500-cpufreq.o
+obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
+obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o
--
1.7.4.4
On Wed, Jun 01, 2011 at 12:48:14PM -0700, Kukjin Kim wrote:
> Dave, could you please see below? If you're ok, will submit remained
> others for Samsung cpufreq drivers.
I'm ok with the principle of the patch, though it doesn't seem to include
any driver movement, so just applying this will break the compile.
(If it happens in another patch, they should really go together to
not break bisecting)
Dave
On 06/01/11 12:54, Dave Jones wrote:
> On Wed, Jun 01, 2011 at 12:48:14PM -0700, Kukjin Kim wrote:
>
> > Dave, could you please see below? If you're ok, will submit remained
> > others for Samsung cpufreq drivers.
>
> I'm ok with the principle of the patch, though it doesn't seem to include
> any driver movement, so just applying this will break the compile.
> (If it happens in another patch, they should really go together to
> not break bisecting)
>
Hi Dave,
OK, will submit others which include moving cpufreq driver soon.
If you don't mind I will make some branch to merge in both, my tree
and yours.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.