For-3.10: CPUFreq: Move drivers to drivers/cpufreq
Subsystems (14)
Viresh Kumar
maintainercover For-3.10: CPUFreq: Move drivers to drivers/cpufreq
Hi Rafael,
These are all the remaining patches i have for 3.10. All of them have received Acks from their maintainers leaving powerpc ones. I have got an additional patch for powerpc (18) this time, it was the only driver left out of drivers/cpufreq.
Please consider them for applying to your bleeding-edge or linux-next.
-------------x--------------x-------------
This patchset targets towards moving all platform specific cpufreq drivers to drivers/cpufreq. This will lead to better consolidation code in future too.
All ARM and powerpc patches are compile tested by me.
Changes since earlier version:
- Additional patch 18/18
Viresh Kumar (18):
cpufreq: ARM: Arrange drivers in alphabetical order
cpufreq: tegra: Move driver to drivers/cpufreq
cpufreq: davinci: move cpufreq driver to drivers/cpufreq
cpufreq: pxa3xx: move cpufreq driver to drivers/cpufreq
cpufreq: pxa2xx: move cpufreq driver to drivers/cpufreq
cpufreq: integrator: move cpufreq driver to drivers/cpufreq
cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq
cpufreq: AVR32: move cpufreq driver to drivers/cpufreq
cpufreq: blackfin: move cpufreq driver to drivers/cpufreq
cpufreq: cris: move cpufreq driver to drivers/cpufreq
cpufreq: ia64: move cpufreq driver to drivers/cpufreq
cpufreq: mips: move cpufreq driver to drivers/cpufreq
cpufreq: sh: move cpufreq driver to drivers/cpufreq
cpufreq: unicore2: move cpufreq driver to drivers/cpufreq
cpufreq: sparc: move cpufreq driver to drivers/cpufreq
cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
cpufreq: powerpc/platforms/cell: move cpufreq driver to
drivers/cpufreq
arch/arm/Kconfig | 72 --------
arch/arm/mach-davinci/Makefile | 1 -
arch/arm/mach-integrator/Makefile | 1 -
arch/arm/mach-pxa/Makefile | 6 -
arch/arm/mach-pxa/include/mach/generic.h | 1 +
arch/arm/mach-s3c24xx/Kconfig | 66 +++-----
arch/arm/mach-s3c24xx/Makefile | 6 -
arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +-
arch/arm/mach-sa1100/Kconfig | 26 +--
arch/arm/mach-sa1100/Makefile | 3 -
arch/arm/mach-sa1100/include/mach/generic.h | 1 +
arch/arm/mach-tegra/Makefile | 1 -
arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 +-
arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +-
arch/avr32/Kconfig | 13 --
arch/avr32/configs/atngw100_defconfig | 2 +-
arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +-
arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +-
arch/avr32/configs/atngw100_mrmt_defconfig | 2 +-
arch/avr32/configs/atngw100mkii_defconfig | 2 +-
.../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +-
.../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +-
arch/avr32/configs/atstk1002_defconfig | 2 +-
arch/avr32/configs/atstk1003_defconfig | 2 +-
arch/avr32/configs/atstk1004_defconfig | 2 +-
arch/avr32/configs/atstk1006_defconfig | 2 +-
arch/avr32/configs/favr-32_defconfig | 2 +-
arch/avr32/configs/hammerhead_defconfig | 2 +-
arch/avr32/configs/mimc200_defconfig | 2 +-
arch/avr32/mach-at32ap/Makefile | 1 -
arch/blackfin/mach-common/Makefile | 1 -
arch/cris/arch-v32/mach-a3/Makefile | 1 -
arch/cris/arch-v32/mach-fs/Makefile | 1 -
arch/ia64/Kconfig | 6 +-
arch/ia64/kernel/Makefile | 1 -
arch/ia64/kernel/cpufreq/Kconfig | 29 ----
arch/ia64/kernel/cpufreq/Makefile | 2 -
arch/mips/Kconfig | 9 +-
arch/mips/kernel/Makefile | 2 -
arch/mips/kernel/cpufreq/Kconfig | 41 -----
arch/mips/kernel/cpufreq/Makefile | 5 -
arch/powerpc/platforms/Kconfig | 31 ----
arch/powerpc/platforms/cell/Kconfig | 26 +--
arch/powerpc/platforms/cell/Makefile | 3 -
arch/powerpc/platforms/pasemi/Makefile | 1 -
arch/powerpc/platforms/powermac/Makefile | 2 -
arch/sh/Kconfig | 18 --
arch/sh/kernel/Makefile | 1 -
arch/sparc/Kconfig | 23 ---
arch/sparc/kernel/Makefile | 3 -
arch/unicore32/kernel/Makefile | 1 -
drivers/cpufreq/Kconfig | 89 ++++++++++
drivers/cpufreq/Kconfig.arm | 184 ++++++++++++++-------
drivers/cpufreq/Kconfig.powerpc | 44 +++++
drivers/cpufreq/Makefile | 42 ++++-
.../cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c | 0
.../cpufreq/blackfin-cpufreq.c | 0
.../cpufreq/cris-artpec3-cpufreq.c | 0
.../cpufreq/cris-etraxfs-cpufreq.c | 0
.../cpufreq.c => drivers/cpufreq/davinci-cpufreq.c | 2 -
.../cpufreq/ia64-acpi-cpufreq.c | 1 -
.../cpu.c => drivers/cpufreq/integrator-cpufreq.c | 2 -
.../kernel => drivers}/cpufreq/loongson2_cpufreq.c | 0
.../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0
.../cpufreq/pmac32-cpufreq.c | 0
.../cpufreq/pmac64-cpufreq.c | 0
.../cpufreq/ppc_cbe_cpufreq.c | 2 +-
.../cpufreq/ppc_cbe_cpufreq_pervasive.c | 3 +-
.../cpufreq/ppc_cbe_cpufreq_pmi.c | 3 +-
.../cpufreq/pxa2xx-cpufreq.c | 2 -
.../cpufreq/pxa3xx-cpufreq.c | 5 +-
.../cpufreq/s3c2410-cpufreq.c | 0
.../cpufreq/s3c2412-cpufreq.c | 3 +-
.../cpufreq/s3c2440-cpufreq.c | 0
.../cpufreq/s3c24xx-cpufreq-debugfs.c | 0
.../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0
.../cpufreq/sa1100-cpufreq.c | 3 +-
.../cpufreq/sa1110-cpufreq.c | 3 +-
.../cpufreq.c => drivers/cpufreq/sh-cpufreq.c | 2 -
.../cpufreq/sparc-us2e-cpufreq.c | 0
.../cpufreq/sparc-us3-cpufreq.c | 0
.../cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c | 2 -
.../cpufreq/unicore2-cpufreq.c | 2 +-
.../linux/ppc_cbe_cpufreq.h | 4 +-
85 files changed, 385 insertions(+), 464 deletions(-)
create mode 100644 arch/arm/mach-pxa/include/mach/generic.h
rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%)
create mode 100644 arch/arm/mach-sa1100/include/mach/generic.h
delete mode 100644 arch/ia64/kernel/cpufreq/Kconfig
delete mode 100644 arch/ia64/kernel/cpufreq/Makefile
delete mode 100644 arch/mips/kernel/cpufreq/Kconfig
delete mode 100644 arch/mips/kernel/cpufreq/Makefile
rename arch/avr32/mach-at32ap/cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c (100%)
rename arch/blackfin/mach-common/cpufreq.c => drivers/cpufreq/blackfin-cpufreq.c (100%)
rename arch/cris/arch-v32/mach-a3/cpufreq.c => drivers/cpufreq/cris-artpec3-cpufreq.c (100%)
rename arch/cris/arch-v32/mach-fs/cpufreq.c => drivers/cpufreq/cris-etraxfs-cpufreq.c (100%)
rename arch/arm/mach-davinci/cpufreq.c => drivers/cpufreq/davinci-cpufreq.c (99%)
rename arch/ia64/kernel/cpufreq/acpi-cpufreq.c => drivers/cpufreq/ia64-acpi-cpufreq.c (99%)
rename arch/arm/mach-integrator/cpu.c => drivers/cpufreq/integrator-cpufreq.c (99%)
rename {arch/mips/kernel => drivers}/cpufreq/loongson2_cpufreq.c (100%)
rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%)
rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%)
rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)
rename arch/powerpc/platforms/cell/cbe_cpufreq.c => drivers/cpufreq/ppc_cbe_cpufreq.c (99%)
rename arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c => drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c (98%)
rename arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c => drivers/cpufreq/ppc_cbe_cpufreq_pmi.c (99%)
rename arch/arm/mach-pxa/cpufreq-pxa2xx.c => drivers/cpufreq/pxa2xx-cpufreq.c (99%)
rename arch/arm/mach-pxa/cpufreq-pxa3xx.c => drivers/cpufreq/pxa3xx-cpufreq.c (98%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%)
rename arch/arm/mach-sa1100/cpu-sa1100.c => drivers/cpufreq/sa1100-cpufreq.c (99%)
rename arch/arm/mach-sa1100/cpu-sa1110.c => drivers/cpufreq/sa1110-cpufreq.c (99%)
rename arch/sh/kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c (99%)
rename arch/sparc/kernel/us2e_cpufreq.c => drivers/cpufreq/sparc-us2e-cpufreq.c (100%)
rename arch/sparc/kernel/us3_cpufreq.c => drivers/cpufreq/sparc-us3-cpufreq.c (100%)
rename arch/arm/mach-tegra/cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c (99%)
rename arch/unicore32/kernel/cpu-ucv2.c => drivers/cpufreq/unicore2-cpufreq.c (96%)
rename arch/powerpc/platforms/cell/cbe_cpufreq.h => include/linux/ppc_cbe_cpufreq.h (82%)Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 1/18 cpufreq: ARM: Arrange drivers in alphabetical order
Normally we keep drivers in alphabetical inside Kconfig and Makefile and over time this was broken for ARM cpufreq drivers. Fix it.
--- drivers/cpufreq/Kconfig.arm | 116 ++++++++++++++++++++++---------------------- drivers/cpufreq/Makefile | 10 ++-- 2 files changed, 63 insertions(+), 63 deletions(-)
drivers/cpufreq/Kconfig.arm +58 -58
@@ -14,6 +14,64 @@ config ARM_DT_BL_CPUFREQ This enables the Generic CPUfreq driver for ARM big.LITTLE platform. This gets frequency tables from DT. +config ARM_EXYNOS_CPUFREQ + bool "SAMSUNG EXYNOS SoCs" + depends on ARCH_EXYNOS + default y + help + This adds the CPUFreq driver common part for Samsung + EXYNOS SoCs. + + If in doubt, say N. + +config ARM_EXYNOS4210_CPUFREQ + def_bool CPU_EXYNOS4210 + help + This adds the CPUFreq driver for Samsung EXYNOS4210 + SoC (S5PV310 or S5PC210). + +config ARM_EXYNOS4X12_CPUFREQ + def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412) + help + This adds the CPUFreq driver for Samsung EXYNOS4X12 + SoC (EXYNOS4212 or EXYNOS4412). + +config ARM_EXYNOS5250_CPUFREQ + def_bool SOC_EXYNOS5250 + help + This adds the CPUFreq driver for Samsung EXYNOS5250 + SoC. + +config ARM_HIGHBANK_CPUFREQ + tristate "Calxeda Highbank-based" + depends on ARCH_HIGHBANK + select CPU_FREQ_TABLE + select GENERIC_CPUFREQ_CPU0 + select PM_OPP + select REGULATOR + + default m + help + This adds the CPUFreq driver for Calxeda Highbank SoC + based boards. + + If in doubt, say N. + +config ARM_IMX6Q_CPUFREQ + tristate "Freescale i.MX6Q cpufreq support" + depends on SOC_IMX6Q + depends on REGULATOR_ANATOP + help + This adds cpufreq driver support for Freescale i.MX6Q SOC. + + If in doubt, say N. + +config ARM_KIRKWOOD_CPUFREQ + def_bool ARCH_KIRKWOOD && OF + help + This adds the CPUFreq driver for Marvell Kirkwood + SoCs. + config ARM_OMAP2PLUS_CPUFREQ bool "TI OMAP2+" depends on ARCH_OMAP2PLUS
@@ -61,67 +119,9 @@ config ARM_S5PV210_CPUFREQ If in doubt, say N. -config ARM_EXYNOS_CPUFREQ - bool "SAMSUNG EXYNOS SoCs" - depends on ARCH_EXYNOS - default y - help - This adds the CPUFreq driver common part for Samsung - EXYNOS SoCs. - - If in doubt, say N. - -config ARM_EXYNOS4210_CPUFREQ - def_bool CPU_EXYNOS4210 - help - This adds the CPUFreq driver for Samsung EXYNOS4210 - SoC (S5PV310 or S5PC210). - -config ARM_EXYNOS4X12_CPUFREQ - def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412) - help - This adds the CPUFreq driver for Samsung EXYNOS4X12 - SoC (EXYNOS4212 or EXYNOS4412). - -config ARM_EXYNOS5250_CPUFREQ - def_bool SOC_EXYNOS5250 - help - This adds the CPUFreq driver for Samsung EXYNOS5250 - SoC. - -config ARM_KIRKWOOD_CPUFREQ - def_bool ARCH_KIRKWOOD && OF - help - This adds the CPUFreq driver for Marvell Kirkwood - SoCs. - -config ARM_IMX6Q_CPUFREQ - tristate "Freescale i.MX6Q cpufreq support" - depends on SOC_IMX6Q - depends on REGULATOR_ANATOP - help - This adds cpufreq driver support for Freescale i.MX6Q SOC. - - If in doubt, say N. - config ARM_SPEAR_CPUFREQ bool "SPEAr CPUFreq support" depends on PLAT_SPEAR default y help This adds the CPUFreq driver support for SPEAr SOCs. - -config ARM_HIGHBANK_CPUFREQ - tristate "Calxeda Highbank-based" - depends on ARCH_HIGHBANK - select CPU_FREQ_TABLE - select GENERIC_CPUFREQ_CPU0 - select PM_OPP - select REGULATOR - - default m - help - This adds the CPUFreq driver for Calxeda Highbank SoC - based boards. - - If in doubt, say N.
drivers/cpufreq/Makefile +5 -5
@@ -50,18 +50,18 @@ obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ) += arm_big_little.o obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o -obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o -obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o -obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o +obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o +obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o +obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o +obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o +obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o -obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o -obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o ################################################################################## # PowerPC platform drivers
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 2/18 cpufreq: tegra: Move driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of ARM based tegra platform to drivers/cpufreq.
--- arch/arm/mach-tegra/Makefile | 1 - drivers/cpufreq/Makefile | 1 + arch/arm/mach-tegra/cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) rename arch/arm/mach-tegra/cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c (99%)
arch/arm/mach-tegra/Makefile +0 -1
@@ -24,7 +24,6 @@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += cpuidle-tegra30.o endif obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o -obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o obj-$(CONFIG_TEGRA_PCI) += pcie.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o
drivers/cpufreq/Makefile +1 -0
@@ -62,6 +62,7 @@ obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o +obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o ################################################################################## # PowerPC platform drivers
drivers/cpufreq/tegra-cpufreq.c renamed from arch/arm/mach-tegra/cpu-tegra.c +0 -2
@@ -1,6 +1,4 @@/* -* arch/arm/mach-tegra/cpu-tegra.c -* * Copyright (C) 2010 Google, Inc. * * Author:
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 3/18 cpufreq: davinci: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of ARM based davinci platform to drivers/cpufreq.
--- arch/arm/mach-davinci/Makefile | 1 - drivers/cpufreq/Makefile | 1 + arch/arm/mach-davinci/cpufreq.c => drivers/cpufreq/davinci-cpufreq.c | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) rename arch/arm/mach-davinci/cpufreq.c => drivers/cpufreq/davinci-cpufreq.c (99%)
arch/arm/mach-davinci/Makefile +0 -1
@@ -37,7 +37,6 @@ obj-$(CONFIG_MACH_MITYOMAPL138) += board-mityomapl138.o obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD) += board-omapl138-hawk.o # Power Management -obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_SUSPEND) += pm.o sleep.o obj-$(CONFIG_HAVE_CLK) += pm_domain.o
drivers/cpufreq/Makefile +1 -0
@@ -49,6 +49,7 @@ obj-$(CONFIG_ARM_BIG_LITTLE_CPUFREQ) += arm_big_little.o # LITTLE drivers, so that it is probed last. obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o +obj-$(CONFIG_ARCH_DAVINCI_DA850) += davinci-cpufreq.o obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o
drivers/cpufreq/davinci-cpufreq.c renamed from arch/arm/mach-davinci/cpufreq.c +0 -2
@@ -30,8 +30,6 @@#include <mach/cpufreq.h> #include <mach/common.h> -#include "clock.h" -struct davinci_cpufreq {struct device *dev;struct clk *armclk;
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 4/18 cpufreq: pxa3xx: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of ARM based pxa3xx platform to drivers/cpufreq.
--- arch/arm/mach-pxa/Makefile | 1 - arch/arm/mach-pxa/include/mach/generic.h | 1 + drivers/cpufreq/Makefile | 1 + .../mach-pxa/cpufreq-pxa3xx.c => drivers/cpufreq/pxa3xx-cpufreq.c | 5 +---- 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/generic.h rename arch/arm/mach-pxa/cpufreq-pxa3xx.c => drivers/cpufreq/pxa3xx-cpufreq.c (98%)
arch/arm/mach-pxa/Makefile +0 -1
@@ -10,7 +10,6 @@ obj-$(CONFIG_PM) += pm.o sleep.o standby.o ifeq ($(CONFIG_CPU_FREQ),y) obj-$(CONFIG_PXA25x) += cpufreq-pxa2xx.o obj-$(CONFIG_PXA27x) += cpufreq-pxa2xx.o -obj-$(CONFIG_PXA3xx) += cpufreq-pxa3xx.o endif # Generic drivers that other drivers may depend upon
arch/arm/mach-pxa/include/mach/generic.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../generic.h"
drivers/cpufreq/Makefile +1 -0
@@ -59,6 +59,7 @@ obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o +obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
drivers/cpufreq/pxa3xx-cpufreq.c renamed from arch/arm/mach-pxa/cpufreq-pxa3xx.c +1 -4
@@ -1,6 +1,4 @@/* -* linux/arch/arm/mach-pxa/cpufreq-pxa3xx.c -* * Copyright (C) 2008 Marvell International Ltd. * * This program is free software; you can redistribute it and/or modify
@@ -17,10 +15,9 @@#include <linux/slab.h> #include <linux/io.h> +#include <mach/generic.h> #include <mach/pxa3xx-regs.h> -#include "generic.h" -#define HSS_104M (0)#define HSS_156M (1)#define HSS_208M (2)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 5/18 cpufreq: pxa2xx: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of ARM based pxa2xx platform to drivers/cpufreq.
--- arch/arm/Kconfig | 7 ------- arch/arm/mach-pxa/Makefile | 5 ----- drivers/cpufreq/Makefile | 2 ++ .../mach-pxa/cpufreq-pxa2xx.c => drivers/cpufreq/pxa2xx-cpufreq.c | 2 -- 4 files changed, 2 insertions(+), 14 deletions(-) rename arch/arm/mach-pxa/cpufreq-pxa2xx.c => drivers/cpufreq/pxa2xx-cpufreq.c (99%)
arch/arm/Kconfig +0 -7
@@ -2177,13 +2177,6 @@ config CPU_FREQ_INTEGRATOR If in doubt, say Y. -config CPU_FREQ_PXA - bool - depends on CPU_FREQ && ARCH_PXA && PXA25x - default y - select CPU_FREQ_DEFAULT_GOV_USERSPACE - select CPU_FREQ_TABLE - config CPU_FREQ_S3C bool help
arch/arm/mach-pxa/Makefile +0 -5
@@ -7,11 +7,6 @@ obj-y += clock.o devices.o generic.o irq.o \ time.o reset.o obj-$(CONFIG_PM) += pm.o sleep.o standby.o -ifeq ($(CONFIG_CPU_FREQ),y) -obj-$(CONFIG_PXA25x) += cpufreq-pxa2xx.o -obj-$(CONFIG_PXA27x) += cpufreq-pxa2xx.o -endif - # Generic drivers that other drivers may depend upon # SoC-specific code
drivers/cpufreq/Makefile +2 -0
@@ -59,6 +59,8 @@ obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o +obj-$(CONFIG_PXA25x) += pxa2xx-cpufreq.o +obj-$(CONFIG_PXA27x) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o
drivers/cpufreq/pxa2xx-cpufreq.c renamed from arch/arm/mach-pxa/cpufreq-pxa2xx.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/arch/arm/mach-pxa/cpufreq-pxa2xx.c -* * Copyright (C) 2002,2003 Intrinsyc Software * * This program is free software; you can redistribute it and/or modify
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 6/18 cpufreq: integrator: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of ARM based integrator platform to drivers/cpufreq.
--- arch/arm/Kconfig | 11 ----------- arch/arm/mach-integrator/Makefile | 1 - drivers/cpufreq/Kconfig.arm | 8 ++++++++ drivers/cpufreq/Makefile | 1 + .../cpu.c => drivers/cpufreq/integrator-cpufreq.c | 2 -- 5 files changed, 9 insertions(+), 14 deletions(-) rename arch/arm/mach-integrator/cpu.c => drivers/cpufreq/integrator-cpufreq.c (99%)
arch/arm/Kconfig +0 -11
@@ -2166,17 +2166,6 @@ config CPU_FREQ_SA1100 config CPU_FREQ_SA1110 bool -config CPU_FREQ_INTEGRATOR - tristate "CPUfreq driver for ARM Integrator CPUs" - depends on ARCH_INTEGRATOR && CPU_FREQ - default y - help - This enables the CPUfreq driver for ARM Integrator CPUs. - - For details, take a look at <file:Documentation/cpu-freq>. - - If in doubt, say Y. - config CPU_FREQ_S3C bool help
arch/arm/mach-integrator/Makefile +0 -1
@@ -9,5 +9,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o obj-$(CONFIG_PCI) += pci_v3.o pci.o -obj-$(CONFIG_CPU_FREQ_INTEGRATOR) += cpu.o obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o
drivers/cpufreq/Kconfig.arm +8 -0
@@ -66,6 +66,14 @@ config ARM_IMX6Q_CPUFREQ If in doubt, say N. +config ARM_INTEGRATOR + tristate "CPUfreq driver for ARM Integrator CPUs" + depends on ARCH_INTEGRATOR + default y + help + This enables the CPUfreq driver for ARM Integrator CPUs. + If in doubt, say Y. + config ARM_KIRKWOOD_CPUFREQ def_bool ARCH_KIRKWOOD && OF help
drivers/cpufreq/Makefile +1 -0
@@ -57,6 +57,7 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o +obj-$(CONFIG_ARM_INTEGRATOR) += integrator-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o obj-$(CONFIG_PXA25x) += pxa2xx-cpufreq.o
drivers/cpufreq/integrator-cpufreq.c renamed from arch/arm/mach-integrator/cpu.c +0 -2
@@ -1,6 +1,4 @@/* -* linux/arch/arm/mach-integrator/cpu.c -* * Copyright (C) 2001-2002 Deep Blue Solutions Ltd. * * This program is free software; you can redistribute it and/or modify
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 7/18 cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of Samsung's ARM based s3c24xx platform to drivers/cpufreq.
---
arch/arm/Kconfig | 46 ---------------
arch/arm/mach-s3c24xx/Kconfig | 66 +++++++++-------------
arch/arm/mach-s3c24xx/Makefile | 6 --
arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +-
arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 ++--
arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +-
drivers/cpufreq/Kconfig.arm | 58 +++++++++++++++++++
drivers/cpufreq/Makefile | 5 ++
.../cpufreq/s3c2410-cpufreq.c | 0
.../cpufreq/s3c2412-cpufreq.c | 3 +-
.../cpufreq/s3c2440-cpufreq.c | 0
.../cpufreq/s3c24xx-cpufreq-debugfs.c | 0
.../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0
14 files changed, 100 insertions(+), 102 deletions(-)
rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%)arch/arm/Kconfig +0 -46
@@ -2166,52 +2166,6 @@ config CPU_FREQ_SA1100 config CPU_FREQ_SA1110 bool -config CPU_FREQ_S3C - bool - help - Internal configuration node for common cpufreq on Samsung SoC - -config CPU_FREQ_S3C24XX - bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" - depends on ARCH_S3C24XX && CPU_FREQ - select CPU_FREQ_S3C - help - This enables the CPUfreq driver for the Samsung S3C24XX family - of CPUs. - - For details, take a look at <file:Documentation/cpu-freq>. - - If in doubt, say N. - -config CPU_FREQ_S3C24XX_PLL - bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" - depends on CPU_FREQ_S3C24XX - help - Compile in support for changing the PLL frequency from the - S3C24XX series CPUfreq driver. The PLL takes time to settle - after a frequency change, so by default it is not enabled. - - This also means that the PLL tables for the selected CPU(s) will - be built which may increase the size of the kernel image. - -config CPU_FREQ_S3C24XX_DEBUG - bool "Debug CPUfreq Samsung driver core" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_dbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_IODEBUG - bool "Debug CPUfreq Samsung driver IO timing" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_iodbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_DEBUGFS - bool "Export debugfs for CPUFreq" - depends on CPU_FREQ_S3C24XX && DEBUG_FS - help - Export status information via debugfs. - endif source "drivers/cpuidle/Kconfig"
arch/arm/mach-s3c24xx/Kconfig +27 -39
141 lines not on this page · raw message
arch/arm/mach-s3c24xx/Makefile +0 -6
@@ -17,13 +17,11 @@ obj- := obj-y += common.o irq.o obj-$(CONFIG_CPU_S3C2410) += s3c2410.o -obj-$(CONFIG_S3C2410_CPUFREQ) += cpufreq-s3c2410.o obj-$(CONFIG_S3C2410_DMA) += dma-s3c2410.o obj-$(CONFIG_S3C2410_PLL) += pll-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_S3C2412_CPUFREQ) += cpufreq-s3c2412.o obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o
@@ -34,7 +32,6 @@ obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o obj-$(CONFIG_CPU_S3C2440) += s3c2440.o irq-s3c2440.o clock-s3c2440.o obj-$(CONFIG_CPU_S3C2442) += s3c2442.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_PLL_12000000) += pll-s3c2440-12000000.o obj-$(CONFIG_S3C2440_PLL_16934400) += pll-s3c2440-16934400.o
@@ -59,9 +56,6 @@ obj-$(CONFIG_S3C2412_IOTIMING) += iotiming-s3c2412.o obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o -obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpufreq.o -obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpufreq-debugfs.o - # # machine support # following is ordered alphabetically by option text.
arch/arm/mach-s3c24xx/include/mach/s3c2412.h renamed from arch/arm/mach-s3c24xx/s3c2412.h +0 -0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c +1 -1
@@ -31,7 +31,7 @@#include <plat/cpu-freq-core.h> #include <plat/clock.h> -#include "s3c2412.h" +#include <mach/s3c2412.h> #define print_ns (x) ((x) / 10), ((x) % 10)
arch/arm/plat-samsung/include/plat/cpu-freq-core.h +5 -5
@@ -202,7 +202,7 @@ extern int s3c_plltab_register(struct cpufreq_frequency_table *plls,extern struct s3c_cpufreq_config *s3c_cpufreq_getconfig (void );extern struct s3c_iotimings *s3c_cpufreq_getiotimings (void ); -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS #define s3c_cpufreq_debugfs_call (x) x#else #define s3c_cpufreq_debugfs_call (x) NULL
@@ -259,17 +259,17 @@ extern void s3c2412_iotiming_set(struct s3c_cpufreq_config *cfg,#define s3c2412_iotiming_set NULL#endif /* CONFIG_S3C2412_IOTIMING */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG #define s3c_freq_dbg(x...) printk(KERN_INFO x)#else #define s3c_freq_dbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_DEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_IODEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG #define s3c_freq_iodbg(x...) printk(KERN_INFO x)#else #define s3c_freq_iodbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_IODEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG */ static inline int s3c_cpufreq_addfreq(struct cpufreq_frequency_table *table, int index, size_t table_size,
arch/arm/plat-samsung/include/plat/cpu-freq.h +3 -3
@@ -126,7 +126,7 @@ struct s3c_cpufreq_board { };/* Things depending on frequency scaling. */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ #define __init_or_cpufreq#else #define __init_or_cpufreq __init
@@ -134,7 +134,7 @@ struct s3c_cpufreq_board {/* Board functions */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ extern int s3c_cpufreq_setboard (struct s3c_cpufreq_board *board);#else
@@ -142,4 +142,4 @@ static inline int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board) {return 0 ; } -#endif /* CONFIG_CPU_FREQ_S3C */ +#endif /* CONFIG_ARM_S3C_CPUFREQ */
drivers/cpufreq/Kconfig.arm +58 -0
70 lines not on this page · raw message
drivers/cpufreq/Makefile +5 -0
@@ -63,7 +63,12 @@ obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o obj-$(CONFIG_PXA25x) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA27x) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o +obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o +obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o +obj-$(CONFIG_ARM_S3C2440_CPUFREQ) += s3c2440-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o
drivers/cpufreq/s3c2410-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2410.c +0 -0
drivers/cpufreq/s3c2412-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2412.c +1 -2
@@ -25,13 +25,12 @@#include <asm/mach/map.h> #include <mach/regs-clock.h> +#include <mach/s3c2412.h> #include <plat/cpu.h> #include <plat/clock.h> #include <plat/cpu-freq-core.h> -#include "s3c2412.h" -/* our clock resources. */ static struct clk *xtal;static struct clk *fclk;
drivers/cpufreq/s3c2440-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2440.c +0 -0
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c renamed from arch/arm/mach-s3c24xx/cpufreq-debugfs.c +0 -0
drivers/cpufreq/s3c24xx-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 10 lines · Viresh Kumar
This patch moves cpufreq driver of Samsung's ARM based s3c24xx platform to
drivers/cpufreq.Cc Ben Dooks <[email protected]>Cc Kukjin Kim <[email protected]>Signed-off-by Viresh Kumar <[email protected]>Acked-by Arnd Bergmann <[email protected]>
Quoted 3 lines
--- arch/arm/Kconfig | 46 --------------- arch/arm/mach-s3c24xx/Kconfig | 66
+++++++++-------------
Quoted 6 lines
arch/arm/mach-s3c24xx/Makefile | 6 --
arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +-
arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 ++--
arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +-
drivers/cpufreq/Kconfig.arm | 58+++++++++++++++++++
Quoted 17 lines
drivers/cpufreq/Makefile | 5 ++
.../cpufreq/s3c2410-cpufreq.c | 0
.../cpufreq/s3c2412-cpufreq.c | 3 +-
.../cpufreq/s3c2440-cpufreq.c | 0
.../cpufreq/s3c24xx-cpufreq-debugfs.c | 0
.../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0
14 files changed, 100 insertions(+), 102 deletions(-)
rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c =>
drivers/cpufreq/s3c2410-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c =>
drivers/cpufreq/s3c2412-cpufreq.c (99%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c =>
drivers/cpufreq/s3c2440-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c =>
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-Quoted 2 lines
cpufreq.c(100%)
Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree.
See below,
Applying: cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
error: patch failed: arch/arm/Kconfig:2166
error: arch/arm/Kconfig: patch does not apply
error: patch failed: arch/arm/mach-s3c24xx/Kconfig:28
error: arch/arm/mach-s3c24xx/Kconfig: patch does not apply
error: patch failed: arch/arm/mach-s3c24xx/Makefile:17
error: arch/arm/mach-s3c24xx/Makefile: patch does not apply
error: patch failed: drivers/cpufreq/Makefile:63
error: drivers/cpufreq/Makefile: patch does not apply
error: drivers/cpufreq/s3c2412-cpufreq.c: does not exist in index Patch failed at 0001 cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Thanks.
- Kukjin
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 3 lines · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree.
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.
What tree/branch? I used:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git for-next
Quoted 3 lines
Applying: cpufreq: s3c24xx: move cpufreq driver to
drivers/cpufreq
error: patch failed:arch/arm/Kconfig:2166
error:arch/arm/Kconfig: patch does not apply
above two are obvious as you haven't applied other patches in this series.
Quoted 6 lines
error: patch failed:
arch/arm/mach-s3c24xx/Kconfig:28
error:arch/arm/mach-s3c24xx/Kconfig: patch does not apply
error: patch failed:arch/arm/mach-s3c24xx/Makefile:17
error:arch/arm/mach-s3c24xx/Makefile: patch does not apply
error: patch failed:drivers/cpufreq/Makefile:63
error:drivers/cpufreq/Makefile: patch does not apply
Same here.
Quoted 1 line
error:
drivers/cpufreq/s3c2412-cpufreq.c: does not exist in index
I can still see it in for-next.
Attached is my patch based of your for-next
From 82f51a4ba40eb7d0af8dd49abcbece5d49467408 Mon Sep 17 00:00:00 2001
Message-Id: <82f51a4ba40eb7d0af8dd49abcbece5d49467408.1365145398.git.viresh.kumar@linaro.org>
From: Viresh Kumar <[email protected]>
Date: Thu, 4 Apr 2013 12:54:15 +0000
Subject: [PATCH] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
This patch moves cpufreq driver of Samsung's ARM based s3c24xx platform to drivers/cpufreq.
Conflicts:
arch/arm/Kconfig
arch/arm/mach-s3c24xx/Kconfig
arch/arm/mach-s3c24xx/Makefile
drivers/cpufreq/Makefile
---
arch/arm/Kconfig | 47 ---------------
arch/arm/mach-s3c24xx/Kconfig | 66 +++++++++-------------
arch/arm/mach-s3c24xx/Makefile | 6 --
arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +-
arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 ++--
arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +-
drivers/cpufreq/Kconfig.arm | 58 +++++++++++++++++++
drivers/cpufreq/Makefile | 9 ++-
.../cpufreq/s3c2410-cpufreq.c | 0
.../cpufreq/s3c2412-cpufreq.c | 3 +-
.../cpufreq/s3c2440-cpufreq.c | 0
.../cpufreq/s3c24xx-cpufreq-debugfs.c | 0
.../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0
14 files changed, 102 insertions(+), 105 deletions(-)
rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%)arch/arm/Kconfig +0 -47
@@ -2189,53 +2189,6 @@ config CPU_FREQ_PXA default y select CPU_FREQ_DEFAULT_GOV_USERSPACE select CPU_FREQ_TABLE - -config CPU_FREQ_S3C - bool - help - Internal configuration node for common cpufreq on Samsung SoC - -config CPU_FREQ_S3C24XX - bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" - depends on ARCH_S3C24XX && CPU_FREQ - select CPU_FREQ_S3C - help - This enables the CPUfreq driver for the Samsung S3C24XX family - of CPUs. - - For details, take a look at <file:Documentation/cpu-freq>. - - If in doubt, say N. - -config CPU_FREQ_S3C24XX_PLL - bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" - depends on CPU_FREQ_S3C24XX - help - Compile in support for changing the PLL frequency from the - S3C24XX series CPUfreq driver. The PLL takes time to settle - after a frequency change, so by default it is not enabled. - - This also means that the PLL tables for the selected CPU(s) will - be built which may increase the size of the kernel image. - -config CPU_FREQ_S3C24XX_DEBUG - bool "Debug CPUfreq Samsung driver core" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_dbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_IODEBUG - bool "Debug CPUfreq Samsung driver IO timing" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_iodbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_DEBUGFS - bool "Export debugfs for CPUFreq" - depends on CPU_FREQ_S3C24XX && DEBUG_FS - help - Export status information via debugfs. - endif source "drivers/cpuidle/Kconfig"
arch/arm/mach-s3c24xx/Kconfig +27 -39
141 lines not on this page · raw message
arch/arm/mach-s3c24xx/Makefile +0 -6
@@ -17,13 +17,11 @@ 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_PLL) += pll-s3c2410.o obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o obj-$(CONFIG_CPU_S3C2412) += s3c2412.o clock-s3c2412.o -obj-$(CONFIG_S3C2412_CPUFREQ) += cpufreq-s3c2412.o obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o
@@ -34,7 +32,6 @@ obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o obj-$(CONFIG_CPU_S3C2440) += s3c2440.o clock-s3c2440.o obj-$(CONFIG_CPU_S3C2442) += s3c2442.o obj-$(CONFIG_CPU_S3C244X) += s3c244x.o clock-s3c244x.o -obj-$(CONFIG_S3C2440_CPUFREQ) += cpufreq-s3c2440.o obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o obj-$(CONFIG_S3C2440_PLL_12000000) += pll-s3c2440-12000000.o obj-$(CONFIG_S3C2440_PLL_16934400) += pll-s3c2440-16934400.o
@@ -59,9 +56,6 @@ obj-$(CONFIG_S3C2412_IOTIMING) += iotiming-s3c2412.o obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o -obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpufreq.o -obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpufreq-debugfs.o - # # machine support # following is ordered alphabetically by option text.
arch/arm/mach-s3c24xx/include/mach/s3c2412.h renamed from arch/arm/mach-s3c24xx/s3c2412.h +0 -0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c +1 -1
@@ -31,7 +31,7 @@#include <plat/cpu-freq-core.h> #include <plat/clock.h> -#include "s3c2412.h" +#include <mach/s3c2412.h> #define print_ns (x) ((x) / 10), ((x) % 10)
arch/arm/plat-samsung/include/plat/cpu-freq-core.h +5 -5
@@ -202,7 +202,7 @@ extern int s3c_plltab_register(struct cpufreq_frequency_table *plls,extern struct s3c_cpufreq_config *s3c_cpufreq_getconfig (void );extern struct s3c_iotimings *s3c_cpufreq_getiotimings (void ); -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS #define s3c_cpufreq_debugfs_call (x) x#else #define s3c_cpufreq_debugfs_call (x) NULL
@@ -259,17 +259,17 @@ extern void s3c2412_iotiming_set(struct s3c_cpufreq_config *cfg,#define s3c2412_iotiming_set NULL#endif /* CONFIG_S3C2412_IOTIMING */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG #define s3c_freq_dbg(x...) printk(KERN_INFO x)#else #define s3c_freq_dbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_DEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_IODEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG #define s3c_freq_iodbg(x...) printk(KERN_INFO x)#else #define s3c_freq_iodbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_IODEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG */ static inline int s3c_cpufreq_addfreq(struct cpufreq_frequency_table *table, int index, size_t table_size,
arch/arm/plat-samsung/include/plat/cpu-freq.h +3 -3
@@ -126,7 +126,7 @@ struct s3c_cpufreq_board { };/* Things depending on frequency scaling. */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ #define __init_or_cpufreq#else #define __init_or_cpufreq __init
@@ -134,7 +134,7 @@ struct s3c_cpufreq_board {/* Board functions */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ extern int s3c_cpufreq_setboard (struct s3c_cpufreq_board *board);#else
@@ -142,4 +142,4 @@ static inline int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board) {return 0 ; } -#endif /* CONFIG_CPU_FREQ_S3C */ +#endif /* CONFIG_ARM_S3C_CPUFREQ */
drivers/cpufreq/Kconfig.arm +58 -0
70 lines not on this page · raw message
drivers/cpufreq/Makefile +7 -2
@@ -45,8 +45,6 @@ obj-$(CONFIG_X86_INTEL_PSTATE) += intel_pstate.o ################################################################################## # ARM SoC drivers obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o -obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o -obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o
@@ -54,6 +52,13 @@ obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o +obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o +obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o +obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o +obj-$(CONFIG_ARM_S3C2440_CPUFREQ) += s3c2440-cpufreq.o +obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o
drivers/cpufreq/s3c2410-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2410.c +0 -0
drivers/cpufreq/s3c2412-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2412.c +1 -2
@@ -25,13 +25,12 @@#include <asm/mach/map.h> #include <mach/regs-clock.h> +#include <mach/s3c2412.h> #include <plat/cpu.h> #include <plat/clock.h> #include <plat/cpu-freq-core.h> -#include "s3c2412.h" -/* our clock resources. */ static struct clk *xtal;static struct clk *fclk;
drivers/cpufreq/s3c2440-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2440.c +0 -0
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c renamed from arch/arm/mach-s3c24xx/cpufreq-debugfs.c +0 -0
drivers/cpufreq/s3c24xx-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 8 lines · Viresh Kumar
Quoted 3 lines · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree.
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.
Well, I'm dropping it. Please merge via the Samsung tree.
Thanks,
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 6 lines · Rafael J. Wysocki
Quoted 2 lines · Viresh Kumar
Quoted 1 line · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based
on
Quoted 1 line
Quoted 1 line
for-next of samsung tree because this touches too many samsung stuff
Quoted 9 lines
so this
Quoted 5 lines
Quoted 1 line
should be sent to upstream via samsung tree.
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.Well, I'm dropping it. Please merge via the Samsung tree.
OK, I will.
I got patch file from Viresh, and there is a sign from Rafael, but it should be ack. So Rafael, let me use your ack on this patch when I apply. If any problems, please let me know.
Thanks.
- Kukjin
Viresh Kumar
maintainerRe: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 6 lines · Kukjin Kim
Quoted 2 lines · Rafael J. Wysocki
Well, I'm dropping it. Please merge via the Samsung tree.
OK, I will.
I got patch file from Viresh, and there is a sign from Rafael, but it should be ack. So Rafael, let me use your ack on this patch when I apply. If any problems, please let me know.
Ahh.. I forgot to remove it. I picked the initial patch from Rafael's tree. But yes, you need it anyway :)
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
In reply to Kukjin KimQuoted 14 lines · Kukjin Kim
Quoted 13 lines · Rafael J. Wysocki
Quoted 2 lines · Viresh Kumar
Quoted 1 line · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based
on
Quoted 1 line
Quoted 1 line
for-next of samsung tree because this touches too many samsung stuff
so this
Quoted 5 lines
Quoted 1 line
should be sent to upstream via samsung tree.
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.
Quoted 7 lines
Quoted 2 lines
Well, I'm dropping it. Please merge via the Samsung tree.
OK, I will.
I got patch file from Viresh, and there is a sign from Rafael, but it should be ack. So Rafael, let me use your ack on this patch when I apply. If any problems, please let me know.
Since it was signed-off by me before, you can assume it's been ACKed as well.
Thanks,
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Rafael J. Wysocki wrote:
[...]
Quoted 12 lines
Quoted 8 lines
Quoted 3 lines
Well, I'm dropping it. Please merge via the Samsung tree.
OK, I will.
I got patch file from Viresh, and there is a sign from Rafael, but it should be ack. So Rafael, let me use your ack on this patch when I apply. If any problems, please let me know.
Since it was signed-off by me before, you can assume it's been ACKed as well.
Thanks.
- Kukjin
Kukjin Kim
Acked-byRe: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
In reply to Rafael J. WysockiQuoted 6 lines · Rafael J. Wysocki
Quoted 5 lines · Viresh Kumar
Quoted 3 lines · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree.
Quoted 6 lines
Quoted 3 lines
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.Well, I'm dropping it. Please merge via the Samsung tree.
Oops, I missed, maybe I have no more chance to send this to upstream for upcoming merge window :-(
Rafael, please take this patch with my ack in your tree, sorry for noise.
If any problems, please kindly let me know.
Thanks.
- Kukjin
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 14 lines · Kukjin Kim
Quoted 6 lines · Rafael J. Wysocki
Quoted 5 lines · Viresh Kumar
Quoted 3 lines · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree.
Quoted 6 lines
Quoted 3 lines
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.Well, I'm dropping it. Please merge via the Samsung tree.
Quoted 8 lines
Oops, I missed, maybe I have no more chance to send this to upstream for upcoming merge window :-(
Rafael, please take this patch with my ack in your tree, sorry for noise.
Acked-by Kukjin Kim <[email protected]>If any problems, please kindly let me know.
Well, I suppose I can take the original patch, but then it will conflict with your tree during merge. Is that not a problem?
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 04/24/13 07:59, Rafael J. Wysocki wrote:
[...]
Quoted 9 lines
Quoted 5 lines
Rafael, please take this patch with my ack in your tree, sorry for noise.
Acked-by Kukjin Kim<[email protected]>If any problems, please kindly let me know.
Well, I suppose I can take the original patch, but then it will conflict with your tree during merge. Is that not a problem?
I think, some conflicts can be occurred but if so, we can fix it before merge window.
- Kukjin
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 8 lines · Kukjin Kim
On 04/24/13 07:59, Rafael J. Wysocki wrote:
[...]
Quoted 4 lines
Quoted 4 lines
Rafael, please take this patch with my ack in your tree, sorry for noise.
Acked-by Kukjin Kim<[email protected]>
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
If any problems, please kindly let me know.
Well, I suppose I can take the original patch, but then it will conflict with your tree during merge. Is that not a problem?
I think, some conflicts can be occurred but if so, we can fix it before merge window.
Well, how exactly would you like to address them?
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Viresh Kumar
maintainerRe: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
In reply to Kukjin KimQuoted 21 lines · Kukjin Kim
Quoted 12 lines · Rafael J. Wysocki
Quoted 10 lines · Viresh Kumar
Quoted 6 lines · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based on
for-next of samsung tree because this touches too many samsung stuff so this
should be sent to upstream via samsung tree.Quoted 7 lines
Quoted 3 lines
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.Well, I'm dropping it. Please merge via the Samsung tree.
Quoted 8 lines
Oops, I missed, maybe I have no more chance to send this to upstream for upcoming merge window :-(
Rafael, please take this patch with my ack in your tree, sorry for noise.
Acked-by Kukjin Kim <[email protected]>If any problems, please kindly let me know.
Who is going to pick this patch now for next merge window?
Why rpm_idle called in rpm_resume ?
Hi, All,
Recently, I'm reviewing the runtime implementation, there is one logical puzzle me a lot, can you help to explain ?
See below, if rpm_callback called with successful return in rpm_resume, rpm_idle will be called, what's the purpose on it ? The device just comeback to active, why call rpm_idle to try to suspend it ? static int rpm_resume(struct device *dev, int rpmflags)
{
...
retval = rpm_callback(callback, dev);
if (retval) {
...
} else {
__update_runtime_status(dev, RPM_ACTIVE)
...
}
if (!retval)
rpm_idle(dev, RPM_ASYNC);
....
}Re: Why rpm_idle called in rpm_resume ?
Quoted 4 lines · Feng Hong
Hi, All,
Recently, I'm reviewing the runtime implementation, there is one logical puzzle me a lot, can you help to explain ?
That's because the resume may be spurious and in fact it may be possible to suspend the device again, which we want to happen if so.
Thanks,
Rafael
Quoted 19 lines
See below, if
rpm_callbackcalled with successful return inrpm_resume,rpm_idlewill be called, what's the purpose on it ? The device just comeback to active, why callrpm_idleto try to suspend it ? static intrpm_resume(struct device *dev, int rpmflags){ ... retval = rpm_callback(callback, dev); if (retval) { ... } else { __update_runtime_status(dev, RPM_ACTIVE) ... } if (!retval) rpm_idle(dev, RPM_ASYNC); .... }--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarQuoted 25 lines · Viresh Kumar
Quoted 24 lines · Kukjin Kim
Quoted 12 lines · Rafael J. Wysocki
Quoted 10 lines · Viresh Kumar
Quoted 6 lines · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based on
for-next of samsung tree because this touches too many samsung stuff so this
should be sent to upstream via samsung tree.Quoted 7 lines
Quoted 3 lines
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.Well, I'm dropping it. Please merge via the Samsung tree.
Oops, I missed, maybe I have no more chance to send this to upstream for upcoming merge window :-(
Quoted 7 lines
Quoted 5 lines
Rafael, please take this patch with my ack in your tree, sorry for noise.
Acked-by Kukjin Kim <[email protected]>If any problems, please kindly let me know.
Who is going to pick this patch now for next merge window?
That doesn't matter I suppose. I can take it, but please rebase it on top of current linux-next.
Thanks,
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 2 lines · Rafael J. Wysocki
That doesn't matter I suppose. I can take it, but please rebase it on top of current linux-next.
I have already done that (attached). But i wasn't sure what Kukjin wants as he may report conflicts again and i will ask the same question for 3.12 :)
--
viresh
From 462f8b87e9fc617dad1d1d8daad2602952ef141a Mon Sep 17 00:00:00 2001
Message-Id: <462f8b87e9fc617dad1d1d8daad2602952ef141a.1368441897.git.viresh.kumar@linaro.org>
From: Viresh Kumar <[email protected]>
Date: Thu, 4 Apr 2013 12:54:15 +0000
Subject: [PATCH] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
This patch moves cpufreq driver of Samsung's ARM based s3c24xx platform to drivers/cpufreq.
---
arch/arm/Kconfig | 47 ---------------
arch/arm/mach-s3c24xx/Kconfig | 66 +++++++++-------------
arch/arm/mach-s3c24xx/Makefile | 6 --
arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +-
arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 ++--
arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +-
drivers/cpufreq/Kconfig.arm | 58 +++++++++++++++++++
drivers/cpufreq/Makefile | 5 ++
.../cpufreq/s3c2410-cpufreq.c | 0
.../cpufreq/s3c2412-cpufreq.c | 3 +-
.../cpufreq/s3c2440-cpufreq.c | 0
.../cpufreq/s3c24xx-cpufreq-debugfs.c | 0
.../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0
14 files changed, 100 insertions(+), 103 deletions(-)
rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%)
rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%)
rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%)arch/arm/Kconfig +0 -47
@@ -2055,53 +2055,6 @@ menu "CPU Power Management" if ARCH_HAS_CPUFREQ source "drivers/cpufreq/Kconfig" - -config CPU_FREQ_S3C - bool - help - Internal configuration node for common cpufreq on Samsung SoC - -config CPU_FREQ_S3C24XX - bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" - depends on ARCH_S3C24XX && CPU_FREQ - select CPU_FREQ_S3C - help - This enables the CPUfreq driver for the Samsung S3C24XX family - of CPUs. - - For details, take a look at <file:Documentation/cpu-freq>. - - If in doubt, say N. - -config CPU_FREQ_S3C24XX_PLL - bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" - depends on CPU_FREQ_S3C24XX - help - Compile in support for changing the PLL frequency from the - S3C24XX series CPUfreq driver. The PLL takes time to settle - after a frequency change, so by default it is not enabled. - - This also means that the PLL tables for the selected CPU(s) will - be built which may increase the size of the kernel image. - -config CPU_FREQ_S3C24XX_DEBUG - bool "Debug CPUfreq Samsung driver core" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_dbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_IODEBUG - bool "Debug CPUfreq Samsung driver IO timing" - depends on CPU_FREQ_S3C24XX - help - Enable s3c_freq_iodbg for the Samsung S3C CPUfreq core - -config CPU_FREQ_S3C24XX_DEBUGFS - bool "Export debugfs for CPUFreq" - depends on CPU_FREQ_S3C24XX && DEBUG_FS - help - Export status information via debugfs. - endif source "drivers/cpuidle/Kconfig"
arch/arm/mach-s3c24xx/Kconfig +27 -39
141 lines not on this page · raw message
arch/arm/mach-s3c24xx/Makefile +0 -6
@@ -17,13 +17,11 @@ 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_PLL) += pll-s3c2410.o obj-$(CONFIG_S3C2410_PM) += pm-s3c2410.o sleep-s3c2410.o obj-$(CONFIG_CPU_S3C2412) += s3c2412.o clock-s3c2412.o -obj-$(CONFIG_S3C2412_CPUFREQ) += cpufreq-s3c2412.o obj-$(CONFIG_S3C2412_DMA) += dma-s3c2412.o obj-$(CONFIG_S3C2412_PM) += pm-s3c2412.o obj-$(CONFIG_S3C2412_PM_SLEEP) += sleep-s3c2412.o
@@ -34,7 +32,6 @@ obj-$(CONFIG_S3C2416_PM) += pm-s3c2416.o obj-$(CONFIG_CPU_S3C2440) += s3c2440.o clock-s3c2440.o obj-$(CONFIG_CPU_S3C2442) += s3c2442.o obj-$(CONFIG_CPU_S3C244X) += s3c244x.o clock-s3c244x.o -obj-$(CONFIG_S3C2440_CPUFREQ) += cpufreq-s3c2440.o obj-$(CONFIG_S3C2440_DMA) += dma-s3c2440.o obj-$(CONFIG_S3C2440_PLL_12000000) += pll-s3c2440-12000000.o obj-$(CONFIG_S3C2440_PLL_16934400) += pll-s3c2440-16934400.o
@@ -59,9 +56,6 @@ obj-$(CONFIG_S3C2412_IOTIMING) += iotiming-s3c2412.o obj-$(CONFIG_S3C2443_COMMON) += common-s3c2443.o obj-$(CONFIG_S3C2443_DMA) += dma-s3c2443.o -obj-$(CONFIG_CPU_FREQ_S3C24XX) += cpufreq.o -obj-$(CONFIG_CPU_FREQ_S3C24XX_DEBUGFS) += cpufreq-debugfs.o - # # machine support # following is ordered alphabetically by option text.
arch/arm/mach-s3c24xx/include/mach/s3c2412.h renamed from arch/arm/mach-s3c24xx/s3c2412.h +0 -0
arch/arm/mach-s3c24xx/iotiming-s3c2412.c +1 -1
@@ -31,7 +31,7 @@#include <plat/cpu-freq-core.h> #include <plat/clock.h> -#include "s3c2412.h" +#include <mach/s3c2412.h> #define print_ns (x) ((x) / 10), ((x) % 10)
arch/arm/plat-samsung/include/plat/cpu-freq-core.h +5 -5
@@ -202,7 +202,7 @@ extern int s3c_plltab_register(struct cpufreq_frequency_table *plls,extern struct s3c_cpufreq_config *s3c_cpufreq_getconfig (void );extern struct s3c_iotimings *s3c_cpufreq_getiotimings (void ); -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUGFS +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS #define s3c_cpufreq_debugfs_call (x) x#else #define s3c_cpufreq_debugfs_call (x) NULL
@@ -259,17 +259,17 @@ extern void s3c2412_iotiming_set(struct s3c_cpufreq_config *cfg,#define s3c2412_iotiming_set NULL#endif /* CONFIG_S3C2412_IOTIMING */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_DEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG #define s3c_freq_dbg(x...) printk(KERN_INFO x)#else #define s3c_freq_dbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_DEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_DEBUG */ -#ifdef CONFIG_CPU_FREQ_S3C24XX_IODEBUG +#ifdef CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG #define s3c_freq_iodbg(x...) printk(KERN_INFO x)#else #define s3c_freq_iodbg(x...) do { if (0) printk(x); } while (0) -#endif /* CONFIG_CPU_FREQ_S3C24XX_IODEBUG */ +#endif /* CONFIG_ARM_S3C24XX_CPUFREQ_IODEBUG */ static inline int s3c_cpufreq_addfreq(struct cpufreq_frequency_table *table, int index, size_t table_size,
arch/arm/plat-samsung/include/plat/cpu-freq.h +3 -3
@@ -126,7 +126,7 @@ struct s3c_cpufreq_board { };/* Things depending on frequency scaling. */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ #define __init_or_cpufreq#else #define __init_or_cpufreq __init
@@ -134,7 +134,7 @@ struct s3c_cpufreq_board {/* Board functions */ -#ifdef CONFIG_CPU_FREQ_S3C +#ifdef CONFIG_ARM_S3C_CPUFREQ extern int s3c_cpufreq_setboard (struct s3c_cpufreq_board *board);#else
@@ -142,4 +142,4 @@ static inline int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board) {return 0 ; } -#endif /* CONFIG_CPU_FREQ_S3C */ +#endif /* CONFIG_ARM_S3C_CPUFREQ */
drivers/cpufreq/Kconfig.arm +58 -0
70 lines not on this page · raw message
drivers/cpufreq/Makefile +5 -0
@@ -65,7 +65,12 @@ obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o obj-$(CONFIG_PXA25x) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA27x) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ) += s3c24xx-cpufreq.o +obj-$(CONFIG_ARM_S3C24XX_CPUFREQ_DEBUGFS) += s3c24xx-cpufreq-debugfs.o +obj-$(CONFIG_ARM_S3C2410_CPUFREQ) += s3c2410-cpufreq.o +obj-$(CONFIG_ARM_S3C2412_CPUFREQ) += s3c2412-cpufreq.o obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o +obj-$(CONFIG_ARM_S3C2440_CPUFREQ) += s3c2440-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o
drivers/cpufreq/s3c2410-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2410.c +0 -0
drivers/cpufreq/s3c2412-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2412.c +1 -2
@@ -25,13 +25,12 @@#include <asm/mach/map.h> #include <mach/regs-clock.h> +#include <mach/s3c2412.h> #include <plat/cpu.h> #include <plat/clock.h> #include <plat/cpu-freq-core.h> -#include "s3c2412.h" -/* our clock resources. */ static struct clk *xtal;static struct clk *fclk;
drivers/cpufreq/s3c2440-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq-s3c2440.c +0 -0
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c renamed from arch/arm/mach-s3c24xx/cpufreq-debugfs.c +0 -0
drivers/cpufreq/s3c24xx-cpufreq.c renamed from arch/arm/mach-s3c24xx/cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
RE: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 10 lines · Viresh Kumar
Quoted 1 line · Rafael J. Wysocki
That doesn't matter I suppose. I can take it, but please rebase it on
top
Quoted 1 line
of current linux-next.
I have already done that (attached). But i wasn't sure what Kukjin wants as
he may report conflicts again and i will ask the same question for 3.12 :)
Since this missed last time, this would be sent to upstream via samsung tree again. It means the conflicts should be handled by myself.
Rafael, if you don't mind, let me take this into Samsung tree for v3.11.
- Kukjin
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 7 lines · Kukjin Kim
Quoted 6 lines · Viresh Kumar
Quoted 1 line · Rafael J. Wysocki
That doesn't matter I suppose. I can take it, but please rebase it on
top
Quoted 1 line
of current linux-next.
Quoted 8 lines
Quoted 4 lines
I have already done that (attached). But i wasn't sure what Kukjin wants as
he may report conflicts again and i will ask the same question for 3.12 :)Since this missed last time, this would be sent to upstream via samsung tree again. It means the conflicts should be handled by myself.
Rafael, if you don't mind, let me take this into Samsung tree for v3.11.
Sure, please go ahead.
Thanks,
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Viresh Kumar
maintainerRe: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
Quoted 12 lines · Rafael J. Wysocki
Quoted 11 lines · Kukjin Kim
Quoted 10 lines · Viresh Kumar
Quoted 1 line · Rafael J. Wysocki
That doesn't matter I suppose. I can take it, but please rebase it on
top
Quoted 1 line
of current linux-next.
I have already done that (attached). But i wasn't sure what Kukjin wants as
he may report conflicts again and i will ask the same question for 3.12 :)
Quoted 6 lines
Quoted 4 lines
Since this missed last time, this would be sent to upstream via samsung tree again. It means the conflicts should be handled by myself.
Rafael, if you don't mind, let me take this into Samsung tree for v3.11.
Sure, please go ahead.
Kukjin,
I hope you have already applied this for linux-next?
Re: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
On 05/20/13 14:29, Viresh Kumar wrote:
[...]
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Rafael, if you don't mind, let me take this into Samsung tree for v3.11.
Sure, please go ahead.
Kukjin,
I hope you have already applied this for linux-next?
Yeah, already done in my local and you can see it in my public tree in a couple of hours :-)
Thanks.
- Kukjin
Viresh Kumar
maintainerRe: [PATCH 07/18] cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarQuoted 26 lines · Viresh Kumar
Quoted 3 lines · Kukjin Kim
Basically, this moving looks good to me, but should be re-worked based on for-next of samsung tree because this touches too many samsung stuff so this should be sent to upstream via samsung tree.
Hmm... Its already applied in Rafael's tree. But it doesn't mean that it can't be
moved to your tree if there is a issue.What tree/branch? I used:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.gitfor-nextQuoted 3 lines
Applying: cpufreq: s3c24xx: move cpufreq driver to
drivers/cpufreq
error: patch failed:arch/arm/Kconfig:2166
error:arch/arm/Kconfig: patch does not applyabove two are obvious as you haven't applied other patches in this series.
Quoted 6 lines
error: patch failed:
arch/arm/mach-s3c24xx/Kconfig:28
error:arch/arm/mach-s3c24xx/Kconfig: patch does not apply
error: patch failed:arch/arm/mach-s3c24xx/Makefile:17
error:arch/arm/mach-s3c24xx/Makefile: patch does not apply
error: patch failed:drivers/cpufreq/Makefile:63
error:drivers/cpufreq/Makefile: patch does not apply
Quoted 7 lines
Same here.
Quoted 1 line
error:
drivers/cpufreq/s3c2412-cpufreq.c: does not exist in indexI can still see it in for-next.
Attached is my patch based of your for-next
Kukjin,
As Rafael has already dropped it, can you apply it at your end and make sure it doesn't miss the merge cycle?
Viresh Kumar
maintainerPATCH 8/18 cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of ARM based sa11x0 platform to drivers/cpufreq.
--- arch/arm/Kconfig | 8 ------- arch/arm/mach-sa1100/Kconfig | 26 +++++++++++----------- arch/arm/mach-sa1100/Makefile | 3 --- arch/arm/mach-sa1100/include/mach/generic.h | 1 + drivers/cpufreq/Kconfig.arm | 6 +++++ drivers/cpufreq/Makefile | 2 ++ .../cpufreq/sa1100-cpufreq.c | 3 +-- .../cpufreq/sa1110-cpufreq.c | 3 +-- 8 files changed, 24 insertions(+), 28 deletions(-) create mode 100644 arch/arm/mach-sa1100/include/mach/generic.h rename arch/arm/mach-sa1100/cpu-sa1100.c => drivers/cpufreq/sa1100-cpufreq.c (99%) rename arch/arm/mach-sa1100/cpu-sa1110.c => drivers/cpufreq/sa1110-cpufreq.c (99%)
arch/arm/Kconfig +0 -8
@@ -2150,7 +2150,6 @@ endmenu menu "CPU Power Management" if ARCH_HAS_CPUFREQ - source "drivers/cpufreq/Kconfig" config CPU_FREQ_IMX
@@ -2159,13 +2158,6 @@ config CPU_FREQ_IMX select CPU_FREQ_TABLE help This enables the CPUfreq driver for i.MX CPUs. - -config CPU_FREQ_SA1100 - bool - -config CPU_FREQ_SA1110 - bool - endif source "drivers/cpuidle/Kconfig"
arch/arm/mach-sa1100/Kconfig +13 -13
@@ -4,7 +4,7 @@ menu "SA11x0 Implementations" config SA1100_ASSABET bool "Assabet" - select CPU_FREQ_SA1110 + select ARM_SA1110_CPUFREQ help Say Y here if you are using the Intel(R) StrongARM(R) SA-1110 Microprocessor Development Board (also known as the Assabet).
@@ -20,7 +20,7 @@ config ASSABET_NEPONSET config SA1100_CERF bool "CerfBoard" - select CPU_FREQ_SA1110 + select ARM_SA1110_CPUFREQ help The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued). More information is available at:
@@ -47,7 +47,7 @@ endchoice config SA1100_COLLIE bool "Sharp Zaurus SL5500" - # FIXME: select CPU_FREQ_SA11x0 + # FIXME: select ARM_SA11x0_CPUFREQ select SHARP_LOCOMO select SHARP_PARAM select SHARP_SCOOP
@@ -56,7 +56,7 @@ config SA1100_COLLIE config SA1100_H3100 bool "Compaq iPAQ H3100" - select CPU_FREQ_SA1110 + select ARM_SA1110_CPUFREQ select HTC_EGPIO help Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -67,7 +67,7 @@ config SA1100_H3100 config SA1100_H3600 bool "Compaq iPAQ H3600/H3700" - select CPU_FREQ_SA1110 + select ARM_SA1110_CPUFREQ select HTC_EGPIO help Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -78,7 +78,7 @@ config SA1100_H3600 config SA1100_BADGE4 bool "HP Labs BadgePAD 4" - select CPU_FREQ_SA1100 + select ARM_SA1100_CPUFREQ select SA1111 help Say Y here if you want to build a kernel for the HP Laboratories
@@ -86,7 +86,7 @@ config SA1100_BADGE4 config SA1100_JORNADA720 bool "HP Jornada 720" - # FIXME: select CPU_FREQ_SA11x0 + # FIXME: select ARM_SA11x0_CPUFREQ select SA1111 help Say Y here if you want to build a kernel for the HP Jornada 720
@@ -105,14 +105,14 @@ config SA1100_JORNADA720_SSP config SA1100_HACKKIT bool "HackKit Core CPU Board" - select CPU_FREQ_SA1100 + select ARM_SA1100_CPUFREQ help Say Y here to support the HackKit Core CPU Board <http://hackkit.eletztrick.de>; config SA1100_LART bool "LART" - select CPU_FREQ_SA1100 + select ARM_SA1100_CPUFREQ help Say Y here if you are using the Linux Advanced Radio Terminal (also known as the LART). See <http://www.lartmaker.nl/> for
@@ -120,7 +120,7 @@ config SA1100_LART config SA1100_NANOENGINE bool "nanoEngine" - select CPU_FREQ_SA1110 + select ARM_SA1110_CPUFREQ select PCI select PCI_NANOENGINE help
@@ -130,7 +130,7 @@ config SA1100_NANOENGINE config SA1100_PLEB bool "PLEB" - select CPU_FREQ_SA1100 + select ARM_SA1100_CPUFREQ help Say Y here if you are using version 1 of the Portable Linux Embedded Board (also known as PLEB).
@@ -139,7 +139,7 @@ config SA1100_PLEB config SA1100_SHANNON bool "Shannon" - select CPU_FREQ_SA1100 + select ARM_SA1100_CPUFREQ help The Shannon (also known as a Tuxscreen, and also as a IS2630) was a limited edition webphone produced by Philips. The Shannon is a SA1100
@@ -148,7 +148,7 @@ config SA1100_SHANNON config SA1100_SIMPAD bool "Simpad" - select CPU_FREQ_SA1110 + select ARM_SA1110_CPUFREQ help The SIEMENS webpad SIMpad is based on the StrongARM 1110. There are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB
arch/arm/mach-sa1100/Makefile +0 -3
@@ -8,9 +8,6 @@ obj-m := obj-n := obj- := -obj-$(CONFIG_CPU_FREQ_SA1100) += cpu-sa1100.o -obj-$(CONFIG_CPU_FREQ_SA1110) += cpu-sa1110.o - # Specific board support obj-$(CONFIG_SA1100_ASSABET) += assabet.o obj-$(CONFIG_ASSABET_NEPONSET) += neponset.o
arch/arm/mach-sa1100/include/mach/generic.h new file +1 -0
@@ -0,0 +1 @@ +#include "../../generic.h"
drivers/cpufreq/Kconfig.arm +6 -0
@@ -185,6 +185,12 @@ config ARM_S5PV210_CPUFREQ If in doubt, say N. +config ARM_SA1100_CPUFREQ + bool + +config ARM_SA1110_CPUFREQ + bool + config ARM_SPEAR_CPUFREQ bool "SPEAr CPUFreq support" depends on PLAT_SPEAR
drivers/cpufreq/Makefile +2 -0
@@ -71,6 +71,8 @@ obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o obj-$(CONFIG_ARM_S3C2440_CPUFREQ) += s3c2440-cpufreq.o obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o +obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o +obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o
drivers/cpufreq/sa1100-cpufreq.c renamed from arch/arm/mach-sa1100/cpu-sa1100.c +1 -2
@@ -91,10 +91,9 @@#include <asm/cputype.h> +#include <mach/generic.h> #include <mach/hardware.h> -#include "generic.h" -struct sa1100_dram_regs {int speed;u32 mdcnfg;
drivers/cpufreq/sa1110-cpufreq.c renamed from arch/arm/mach-sa1100/cpu-sa1110.c +1 -2
@@ -27,10 +27,9 @@#include <asm/cputype.h> #include <asm/mach-types.h> +#include <mach/generic.h> #include <mach/hardware.h> -#include "generic.h" -#undef DEBUGstruct sdram_params {
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 9/18 cpufreq: AVR32: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of AVR32 based at32ap platform to drivers/cpufreq.
--- arch/avr32/Kconfig | 13 ------------- arch/avr32/configs/atngw100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +- arch/avr32/configs/atngw100_mrmt_defconfig | 2 +- arch/avr32/configs/atngw100mkii_defconfig | 2 +- arch/avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +- arch/avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +- arch/avr32/configs/atstk1002_defconfig | 2 +- arch/avr32/configs/atstk1003_defconfig | 2 +- arch/avr32/configs/atstk1004_defconfig | 2 +- arch/avr32/configs/atstk1006_defconfig | 2 +- arch/avr32/configs/favr-32_defconfig | 2 +- arch/avr32/configs/hammerhead_defconfig | 2 +- arch/avr32/configs/mimc200_defconfig | 2 +- arch/avr32/mach-at32ap/Makefile | 1 - drivers/cpufreq/Kconfig | 13 +++++++++++++ drivers/cpufreq/Makefile | 4 ++++ .../cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c | 0 19 files changed, 31 insertions(+), 28 deletions(-) rename arch/avr32/mach-at32ap/cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c (100%)
arch/avr32/Kconfig +0 -13
@@ -250,20 +250,7 @@ config ARCH_SUSPEND_POSSIBLE def_bool y menu "CPU Frequency scaling" - source "drivers/cpufreq/Kconfig" - -config CPU_FREQ_AT32AP - bool "CPU frequency driver for AT32AP" - depends on CPU_FREQ && PLATFORM_AT32AP - default n - help - This enables the CPU frequency driver for AT32AP processors. - - For details, take a look in <file:Documentation/cpu-freq>. - - If in doubt, say N. - endmenu endmenu
arch/avr32/configs/atngw100_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atngw100_evklcd100_defconfig +1 -1
@@ -28,7 +28,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atngw100_evklcd101_defconfig +1 -1
@@ -27,7 +27,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atngw100_mrmt_defconfig +1 -1
@@ -23,7 +23,7 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/avr32/configs/atngw100mkii_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atngw100mkii_evklcd100_defconfig +1 -1
@@ -29,7 +29,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atngw100mkii_evklcd101_defconfig +1 -1
@@ -28,7 +28,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atstk1002_defconfig +1 -1
@@ -25,7 +25,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atstk1003_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atstk1004_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/atstk1006_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_NET=y CONFIG_PACKET=y
arch/avr32/configs/favr-32_defconfig +1 -1
@@ -27,7 +27,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/avr32/configs/hammerhead_defconfig +1 -1
@@ -31,7 +31,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/avr32/configs/mimc200_defconfig +1 -1
@@ -24,7 +24,7 @@ CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_STAT is not set CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_USERSPACE=y -CONFIG_CPU_FREQ_AT32AP=y +CONFIG_AVR32_AT32AP_CPUFREQ=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y
arch/avr32/mach-at32ap/Makefile +0 -1
@@ -1,7 +1,6 @@ obj-y += pdc.o clock.o intc.o extint.o pio.o hsmc.o obj-y += hmatrix.o obj-$(CONFIG_CPU_AT32AP700X) += at32ap700x.o pm-at32ap700x.o -obj-$(CONFIG_CPU_FREQ_AT32AP) += cpufreq.o obj-$(CONFIG_PM) += pm.o ifeq ($(CONFIG_PM_DEBUG),y)
drivers/cpufreq/Kconfig +13 -0
@@ -205,6 +205,19 @@ depends on ARM source "drivers/cpufreq/Kconfig.arm" endmenu +menu "AVR32 CPU frequency scaling drivers" +depends on AVR32 + +config AVR32_AT32AP_CPUFREQ + bool "CPU frequency driver for AT32AP" + depends on PLATFORM_AT32AP + default n + help + This enables the CPU frequency driver for AT32AP processors. + If in doubt, say N. + +endmenu + menu "PowerPC CPU frequency scaling drivers" depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc"
drivers/cpufreq/Makefile +4 -0
@@ -79,3 +79,7 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o ################################################################################## # PowerPC platform drivers obj-$(CONFIG_CPU_FREQ_MAPLE) += maple-cpufreq.o + +################################################################################## +# Other platform drivers +obj-$(CONFIG_AVR32_AT32AP_CPUFREQ) += at32ap-cpufreq.o
drivers/cpufreq/at32ap-cpufreq.c renamed from arch/avr32/mach-at32ap/cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 10/18 cpufreq: blackfin: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of BLACKFIN architecture to drivers/cpufreq.
--- arch/blackfin/mach-common/Makefile | 1 - drivers/cpufreq/Makefile | 1 + .../blackfin/mach-common/cpufreq.c => drivers/cpufreq/blackfin-cpufreq.c | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename arch/blackfin/mach-common/cpufreq.c => drivers/cpufreq/blackfin-cpufreq.c (100%)
arch/blackfin/mach-common/Makefile +0 -1
@@ -10,7 +10,6 @@ obj-$(CONFIG_PM) += pm.o ifneq ($(CONFIG_BF60x),y) obj-$(CONFIG_PM) += dpmc_modes.o endif -obj-$(CONFIG_CPU_FREQ) += cpufreq.o obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o
drivers/cpufreq/Makefile +1 -0
@@ -83,3 +83,4 @@ obj-$(CONFIG_CPU_FREQ_MAPLE) += maple-cpufreq.o ################################################################################## # Other platform drivers obj-$(CONFIG_AVR32_AT32AP_CPUFREQ) += at32ap-cpufreq.o +obj-$(CONFIG_BLACKFIN) += blackfin-cpufreq.o
drivers/cpufreq/blackfin-cpufreq.c renamed from arch/blackfin/mach-common/cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 11/18 cpufreq: cris: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq drivers of CRIS architecture to drivers/cpufreq.
--- arch/cris/arch-v32/mach-a3/Makefile | 1 - arch/cris/arch-v32/mach-fs/Makefile | 1 - drivers/cpufreq/Makefile | 2 ++ .../mach-a3/cpufreq.c => drivers/cpufreq/cris-artpec3-cpufreq.c | 0 .../mach-fs/cpufreq.c => drivers/cpufreq/cris-etraxfs-cpufreq.c | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename arch/cris/arch-v32/mach-a3/cpufreq.c => drivers/cpufreq/cris-artpec3-cpufreq.c (100%) rename arch/cris/arch-v32/mach-fs/cpufreq.c => drivers/cpufreq/cris-etraxfs-cpufreq.c (100%)
arch/cris/arch-v32/mach-a3/Makefile +0 -1
@@ -3,7 +3,6 @@ # obj-y := dma.o pinmux.o io.o arbiter.o -obj-$(CONFIG_CPU_FREQ) += cpufreq.o clean:
arch/cris/arch-v32/mach-fs/Makefile +0 -1
@@ -3,7 +3,6 @@ # obj-y := dma.o pinmux.o io.o arbiter.o -obj-$(CONFIG_CPU_FREQ) += cpufreq.o clean:
drivers/cpufreq/Makefile +2 -0
@@ -84,3 +84,5 @@ obj-$(CONFIG_CPU_FREQ_MAPLE) += maple-cpufreq.o # Other platform drivers obj-$(CONFIG_AVR32_AT32AP_CPUFREQ) += at32ap-cpufreq.o obj-$(CONFIG_BLACKFIN) += blackfin-cpufreq.o +obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o +obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o
drivers/cpufreq/cris-artpec3-cpufreq.c renamed from arch/cris/arch-v32/mach-a3/cpufreq.c +0 -0
drivers/cpufreq/cris-etraxfs-cpufreq.c renamed from arch/cris/arch-v32/mach-fs/cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 12/18 cpufreq: ia64: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of IA64 architecture to drivers/cpufreq.
--- arch/ia64/Kconfig | 6 ++--- arch/ia64/kernel/Makefile | 1 - arch/ia64/kernel/cpufreq/Kconfig | 29 ---------------------- arch/ia64/kernel/cpufreq/Makefile | 2 -- drivers/cpufreq/Kconfig | 17 +++++++++++++ drivers/cpufreq/Makefile | 1 + .../cpufreq/ia64-acpi-cpufreq.c | 1 - 7 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 arch/ia64/kernel/cpufreq/Kconfig delete mode 100644 arch/ia64/kernel/cpufreq/Makefile rename arch/ia64/kernel/cpufreq/acpi-cpufreq.c => drivers/cpufreq/ia64-acpi-cpufreq.c (99%)
arch/ia64/Kconfig +3 -3
@@ -591,9 +591,9 @@ source "kernel/power/Kconfig" source "drivers/acpi/Kconfig" if PM - -source "arch/ia64/kernel/cpufreq/Kconfig" - +menu "CPU Frequency scaling" +source "drivers/cpufreq/Kconfig" +endmenu endif endmenu
arch/ia64/kernel/Makefile +0 -1
@@ -23,7 +23,6 @@ obj-$(CONFIG_SMP) += smp.o smpboot.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o obj-$(CONFIG_IA64_CYCLONE) += cyclone.o -obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o obj-$(CONFIG_KPROBES) += kprobes.o jprobes.o obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
arch/ia64/kernel/cpufreq/Kconfig deleted +0 -29
@@ -1,29 +0,0 @@ - -# -# CPU Frequency scaling -# - -menu "CPU Frequency scaling" - -source "drivers/cpufreq/Kconfig" - -if CPU_FREQ - -comment "CPUFreq processor drivers" - -config IA64_ACPI_CPUFREQ - tristate "ACPI Processor P-States driver" - select CPU_FREQ_TABLE - depends on ACPI_PROCESSOR - help - This driver adds a CPUFreq driver which utilizes the ACPI - Processor Performance States. - - For details, take a look at <file:Documentation/cpu-freq/>. - - If in doubt, say N. - -endif # CPU_FREQ - -endmenu -
arch/ia64/kernel/cpufreq/Makefile deleted +0 -2
@@ -1,2 +0,0 @@ -obj-$(CONFIG_IA64_ACPI_CPUFREQ) += acpi-cpufreq.o -
drivers/cpufreq/Kconfig +17 -0
@@ -218,6 +218,23 @@ config AVR32_AT32AP_CPUFREQ endmenu +menu "CPUFreq processor drivers" +depends on IA64 + +config IA64_ACPI_CPUFREQ + tristate "ACPI Processor P-States driver" + select CPU_FREQ_TABLE + depends on ACPI_PROCESSOR + help + This driver adds a CPUFreq driver which utilizes the ACPI + Processor Performance States. + + For details, take a look at <file:Documentation/cpu-freq/>. + + If in doubt, say N. + +endmenu + menu "PowerPC CPU frequency scaling drivers" depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc"
drivers/cpufreq/Makefile +1 -0
@@ -86,3 +86,4 @@ obj-$(CONFIG_AVR32_AT32AP_CPUFREQ) += at32ap-cpufreq.o obj-$(CONFIG_BLACKFIN) += blackfin-cpufreq.o obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o +obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o
drivers/cpufreq/ia64-acpi-cpufreq.c renamed from arch/ia64/kernel/cpufreq/acpi-cpufreq.c +0 -1
@@ -1,5 +1,4 @@/* -* arch/ia64/kernel/cpufreq/acpi-cpufreq.c * This file provides the ACPI based P-state support. This * module works with generic cpufreq infrastructure. Most of * the code is based on i386 version
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 13/18 cpufreq: mips: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of MIPS architecture to drivers/cpufreq.
---
arch/mips/Kconfig | 9 ++++-
arch/mips/kernel/Makefile | 2 --
arch/mips/kernel/cpufreq/Kconfig | 41 ----------------------
arch/mips/kernel/cpufreq/Makefile | 5 ---
drivers/cpufreq/Kconfig | 18 ++++++++++
drivers/cpufreq/Makefile | 1 +
.../kernel => drivers}/cpufreq/loongson2_cpufreq.c | 0
7 files changed, 27 insertions(+), 49 deletions(-)
delete mode 100644 arch/mips/kernel/cpufreq/Kconfig
delete mode 100644 arch/mips/kernel/cpufreq/Makefile
rename {arch/mips/kernel => drivers}/cpufreq/loongson2_cpufreq.c (100%)arch/mips/Kconfig +8 -1
@@ -2539,7 +2539,14 @@ source "kernel/power/Kconfig" endmenu -source "arch/mips/kernel/cpufreq/Kconfig" +config MIPS_EXTERNAL_TIMER + bool + +if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER +menu "CPU Power Management" +source "drivers/cpufreq/Kconfig" +endmenu +endif source "net/Kconfig"
arch/mips/kernel/Makefile +0 -2
@@ -92,8 +92,6 @@ CFLAGS_cpu-bugs64.o = $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/n obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT) += 8250-platform.o -obj-$(CONFIG_MIPS_CPUFREQ) += cpufreq/ - obj-$(CONFIG_PERF_EVENTS) += perf_event.o obj-$(CONFIG_HW_PERF_EVENTS) += perf_event_mipsxx.o
arch/mips/kernel/cpufreq/Kconfig deleted +0 -41
41 lines not on this page · raw message
arch/mips/kernel/cpufreq/Makefile deleted +0 -5
@@ -1,5 +0,0 @@ -# -# Makefile for the Linux/MIPS cpufreq. -# - -obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
drivers/cpufreq/Kconfig +18 -0
@@ -235,6 +235,24 @@ config IA64_ACPI_CPUFREQ endmenu +menu "MIPS CPUFreq processor drivers" +depends on MIPS + +config LOONGSON2_CPUFREQ + tristate "Loongson2 CPUFreq Driver" + select CPU_FREQ_TABLE + help + This option adds a CPUFreq driver for loongson processors which + support software configurable cpu frequency. + + Loongson2F and it's successors support this feature. + + For details, take a look at <file:Documentation/cpu-freq/>. + + If in doubt, say N. + +endmenu + menu "PowerPC CPU frequency scaling drivers" depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc"
drivers/cpufreq/Makefile +1 -0
@@ -87,3 +87,4 @@ obj-$(CONFIG_BLACKFIN) += blackfin-cpufreq.o obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o +obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
drivers/cpufreq/loongson2_cpufreq.c renamed from arch/mips/kernel/cpufreq/loongson2_cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 14/18 cpufreq: sh: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of SUPERH architecture to drivers/cpufreq.
--- arch/sh/Kconfig | 18 ------------------ arch/sh/kernel/Makefile | 1 - drivers/cpufreq/Kconfig | 18 ++++++++++++++++++ drivers/cpufreq/Makefile | 1 + .../kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c | 2 -- 5 files changed, 19 insertions(+), 21 deletions(-) rename arch/sh/kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c (99%)
arch/sh/Kconfig +0 -18
@@ -624,25 +624,7 @@ config SH_CLK_CPG_LEGACY endmenu menu "CPU Frequency scaling" - source "drivers/cpufreq/Kconfig" - -config SH_CPU_FREQ - tristate "SuperH CPU Frequency driver" - depends on CPU_FREQ - select CPU_FREQ_TABLE - help - This adds the cpufreq driver for SuperH. Any CPU that supports - clock rate rounding through the clock framework can use this - driver. While it will make the kernel slightly larger, this is - harmless for CPUs that don't support rate rounding. The driver - will also generate a notice in the boot log before disabling - itself if the CPU in question is not capable of rate rounding. - - For details, take a look at <file:Documentation/cpu-freq>. - - If unsure, say N. - endmenu source "arch/sh/drivers/Kconfig"
arch/sh/kernel/Makefile +0 -1
@@ -31,7 +31,6 @@ obj-$(CONFIG_VSYSCALL) += vsyscall/ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o obj-$(CONFIG_KGDB) += kgdb.o -obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
drivers/cpufreq/Kconfig +18 -0
@@ -258,5 +258,23 @@ depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc" endmenu +menu "SH CPU Frequency scaling" +depends on SUPERH +config SH_CPU_FREQ + tristate "SuperH CPU Frequency driver" + select CPU_FREQ_TABLE + help + This adds the cpufreq driver for SuperH. Any CPU that supports + clock rate rounding through the clock framework can use this + driver. While it will make the kernel slightly larger, this is + harmless for CPUs that don't support rate rounding. The driver + will also generate a notice in the boot log before disabling + itself if the CPU in question is not capable of rate rounding. + + For details, take a look at <file:Documentation/cpu-freq>. + + If unsure, say N. +endmenu + endif endmenu
drivers/cpufreq/Makefile +1 -0
@@ -88,3 +88,4 @@ obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o +obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o
drivers/cpufreq/sh-cpufreq.c renamed from arch/sh/kernel/cpufreq.c +0 -2
@@ -1,6 +1,4 @@/* -* arch/sh/kernel/cpufreq.c -* * cpufreq driver for the SuperH processors. * * Copyright (C) 2002 - 2012 Paul Mundt
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 14/18] cpufreq: sh: move cpufreq driver to drivers/cpufreq
Quoted 1 line · Viresh Kumar
This patch moves cpufreq driver of SUPERH architecture to
drivers/cpufreq.
Why?
I am missing the cover email where I assume the explanation lies.
Quoted 115 lines
Cc Paul Mundt <[email protected]>Signed-off-by Viresh Kumar <[email protected]>Acked-by Paul Mundt <[email protected]>--- arch/sh/Kconfig | 18 ------------------ arch/sh/kernel/Makefile | 1 - drivers/cpufreq/Kconfig | 18 ++++++++++++++++++ drivers/cpufreq/Makefile | 1 + .../kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c | 2 -- 5 files changed, 19 insertions(+), 21 deletions(-) rename arch/sh/kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c (99%)arch/sh/Kconfig +0
-18@@ -624,25 +624,7 @@ config SH_CLK_CPG_LEGACY endmenu menu "CPU Frequency scaling" - source "drivers/cpufreq/Kconfig" - -config SH_CPU_FREQ - tristate "SuperH CPU Frequency driver" - depends on CPU_FREQ - select CPU_FREQ_TABLE - help - This adds the cpufreq driver for SuperH. Any CPU that supports - clock rate rounding through the clock framework can use this - driver. While it will make the kernel slightly larger, this is - harmless for CPUs that don't support rate rounding. The driver - will also generate a notice in the boot log before disabling - itself if the CPU in question is not capable of rate rounding. - - For details, take a look at <file:Documentation/cpu-freq>. - - If unsure, say N. - endmenu source "arch/sh/drivers/Kconfig"arch/sh/kernel/Makefile +0
-1@@ -31,7 +31,6 @@ obj-$(CONFIG_VSYSCALL) += vsyscall/ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o obj-$(CONFIG_KGDB) += kgdb.o -obj-$(CONFIG_SH_CPU_FREQ) += cpufreq.o obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.odrivers/cpufreq/Kconfig +18
-0@@ -258,5 +258,23 @@ depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc" endmenu +menu "SH CPU Frequency scaling" +depends on SUPERH +config SH_CPU_FREQ + tristate "SuperH CPU Frequency driver" + select CPU_FREQ_TABLE + help + This adds the cpufreq driver for SuperH. Any CPU that supports + clock rate rounding through the clock framework can use this + driver. While it will make the kernel slightly larger, this is + harmless for CPUs that don't support rate rounding. The driver + will also generate a notice in the boot log before disabling + itself if the CPU in question is not capable of rate rounding. + + For details, take a look at <file:Documentation/cpu-freq>. + + If unsure, say N. +endmenu + endif endmenudrivers/cpufreq/Makefile +1
-0@@ -88,3 +88,4 @@ obj-$(CONFIG_CRIS_MACH_ARTPEC3) += cris-artpec3-cpufreq.o obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o +obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.odrivers/cpufreq/sh-cpufreq.c renamed from arch/sh/kernel/cpufreq.c +0
-2@@ -1,6 +1,4 @@/* -* arch/sh/kernel/cpufreq.c -* * cpufreq driver for the SuperH processors. * * Copyright (C) 2002 - 2012 Paul Mundt Signature · 6 lines
1.7.12.rc2.18.g61b472e -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Viresh Kumar
maintainerRe: [PATCH 14/18] cpufreq: sh: move cpufreq driver to drivers/cpufreq
Quoted 6 lines · Simon Horman
Quoted 1 line · Viresh Kumar
This patch moves cpufreq driver of SUPERH architecture to
drivers/cpufreq.Why?
I am missing the cover email where I assume the explanation lies.
Hi Simon,
The idea was to keep all cpufreq drivers at a common and most suitable place, so that future consolidation work can be done easily and efficiently.
So, functionally this patch shouldn't change anything.
Re: [PATCH 14/18] cpufreq: sh: move cpufreq driver to drivers/cpufreq
Quoted 6 lines · Viresh Kumar
Quoted 5 lines · Simon Horman
Quoted 1 line · Viresh Kumar
This patch moves cpufreq driver of SUPERH architecture to
drivers/cpufreq.Why?
Quoted 8 lines
Quoted 1 line
I am missing the cover email where I assume the explanation lies.
Hi Simon,
The idea was to keep all cpufreq drivers at a common and most suitable place, so that future consolidation work can be done easily and efficiently.
So, functionally this patch shouldn't change anything.
Thanks, I understand.
I have no objections to this, but Paul should probably review it.
Viresh Kumar
maintainerRe: [PATCH 14/18] cpufreq: sh: move cpufreq driver to drivers/cpufreq
Quoted 3 lines · Simon Horman
Thanks, I understand.
I have no objections to this, but Paul should probably review it.
It is already Acked by him and applied by Rafael.
Re: [PATCH 14/18] cpufreq: sh: move cpufreq driver to drivers/cpufreq
Quoted 6 lines · Viresh Kumar
Quoted 3 lines · Simon Horman
Thanks, I understand.
I have no objections to this, but Paul should probably review it.
It is already Acked by him and applied by Rafael.
:)
Viresh Kumar
maintainerPATCH 15/18 cpufreq: unicore2: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of UNICORE-2 architecture to drivers/cpufreq.
--- arch/unicore32/kernel/Makefile | 1 - drivers/cpufreq/Makefile | 1 + arch/unicore32/kernel/cpu-ucv2.c => drivers/cpufreq/unicore2-cpufreq.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/unicore32/kernel/cpu-ucv2.c => drivers/cpufreq/unicore2-cpufreq.c (96%)
arch/unicore32/kernel/Makefile +0 -1
@@ -9,7 +9,6 @@ obj-y += setup.o signal.o sys.o stacktrace.o traps.o obj-$(CONFIG_MODULES) += ksyms.o module.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -obj-$(CONFIG_CPU_FREQ) += cpu-ucv2.o obj-$(CONFIG_UNICORE_FPU_F64) += fpu-ucf64.o # obj-y for architecture PKUnity v3
drivers/cpufreq/Makefile +1 -0
@@ -89,3 +89,4 @@ obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o +obj-$(CONFIG_UNICORE32) += unicore2-cpufreq.o
drivers/cpufreq/unicore2-cpufreq.c renamed from arch/unicore32/kernel/cpu-ucv2.c +1 -1
@@ -1,5 +1,5 @@/* -* linux/arch/unicore32/kernel/cpu-ucv2.c: clock scaling for the UniCore-II +* clock scaling for the UniCore-II * * Code specific to PKUnity SoC and UniCore ISA *
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 16/18 cpufreq: sparc: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of SPARC architecture to drivers/cpufreq.
--- arch/sparc/Kconfig | 23 ---------------------- arch/sparc/kernel/Makefile | 3 --- drivers/cpufreq/Kconfig | 23 ++++++++++++++++++++++ drivers/cpufreq/Makefile | 2 ++ .../cpufreq/sparc-us2e-cpufreq.c | 0 .../cpufreq/sparc-us3-cpufreq.c | 0 6 files changed, 25 insertions(+), 26 deletions(-) rename arch/sparc/kernel/us2e_cpufreq.c => drivers/cpufreq/sparc-us2e-cpufreq.c (100%) rename arch/sparc/kernel/us3_cpufreq.c => drivers/cpufreq/sparc-us3-cpufreq.c (100%)
arch/sparc/Kconfig +0 -23
@@ -254,29 +254,6 @@ config HOTPLUG_CPU if SPARC64 source "drivers/cpufreq/Kconfig" - -config US3_FREQ - tristate "UltraSPARC-III CPU Frequency driver" - depends on CPU_FREQ - select CPU_FREQ_TABLE - help - This adds the CPUFreq driver for UltraSPARC-III processors. - - For details, take a look at <file:Documentation/cpu-freq>. - - If in doubt, say N. - -config US2E_FREQ - tristate "UltraSPARC-IIe CPU Frequency driver" - depends on CPU_FREQ - select CPU_FREQ_TABLE - help - This adds the CPUFreq driver for UltraSPARC-IIe processors. - - For details, take a look at <file:Documentation/cpu-freq>. - - If in doubt, say N. - endif config US3_MC
arch/sparc/kernel/Makefile +0 -3
@@ -102,9 +102,6 @@ obj-$(CONFIG_PCI_MSI) += pci_msi.o obj-$(CONFIG_COMPAT) += sys32.o sys_sparc32.o signal32.o -# sparc64 cpufreq -obj-$(CONFIG_US3_FREQ) += us3_cpufreq.o -obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o obj-$(CONFIG_US3_MC) += chmc.o obj-$(CONFIG_KPROBES) += kprobes.o
drivers/cpufreq/Kconfig +23 -0
@@ -258,6 +258,29 @@ depends on PPC32 || PPC64 source "drivers/cpufreq/Kconfig.powerpc" endmenu +menu "SPARC CPU frequency scaling drivers" +depends on SPARC64 +config SPARC_US3_CPUFREQ + tristate "UltraSPARC-III CPU Frequency driver" + select CPU_FREQ_TABLE + help + This adds the CPUFreq driver for UltraSPARC-III processors. + + For details, take a look at <file:Documentation/cpu-freq>. + + If in doubt, say N. + +config SPARC_US2E_CPUFREQ + tristate "UltraSPARC-IIe CPU Frequency driver" + select CPU_FREQ_TABLE + help + This adds the CPUFreq driver for UltraSPARC-IIe processors. + + For details, take a look at <file:Documentation/cpu-freq>. + + If in doubt, say N. +endmenu + menu "SH CPU Frequency scaling" depends on SUPERH config SH_CPU_FREQ
drivers/cpufreq/Makefile +2 -0
@@ -89,4 +89,6 @@ obj-$(CONFIG_ETRAXFS) += cris-etraxfs-cpufreq.o obj-$(CONFIG_IA64_ACPI_CPUFREQ) += ia64-acpi-cpufreq.o obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o +obj-$(CONFIG_SPARC_US2E_CPUFREQ) += sparc-us2e-cpufreq.o +obj-$(CONFIG_SPARC_US3_CPUFREQ) += sparc-us3-cpufreq.o obj-$(CONFIG_UNICORE32) += unicore2-cpufreq.o
drivers/cpufreq/sparc-us2e-cpufreq.c renamed from arch/sparc/kernel/us2e_cpufreq.c +0 -0
drivers/cpufreq/sparc-us3-cpufreq.c renamed from arch/sparc/kernel/us3_cpufreq.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerPATCH 17/18 cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of powerpc platform to drivers/cpufreq.
---
Compile Tested only.
arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)
arch/powerpc/platforms/Kconfig +0 -31
@@ -194,37 +194,6 @@ config PPC_IO_WORKAROUNDS source "drivers/cpufreq/Kconfig" -menu "CPU Frequency drivers" - depends on CPU_FREQ - -config CPU_FREQ_PMAC - bool "Support for Apple PowerBooks" - depends on ADB_PMU && PPC32 - select CPU_FREQ_TABLE - help - This adds support for frequency switching on Apple PowerBooks, - this currently includes some models of iBook & Titanium - PowerBook. - -config CPU_FREQ_PMAC64 - bool "Support for some Apple G5s" - depends on PPC_PMAC && PPC64 - select CPU_FREQ_TABLE - help - This adds support for frequency switching on Apple iMac G5, - and some of the more recent desktop G5 machines as well. - -config PPC_PASEMI_CPUFREQ - bool "Support for PA Semi PWRficient" - depends on PPC_PASEMI - default y - select CPU_FREQ_TABLE - help - This adds the support for frequency switching on PA Semi - PWRficient processors. - -endmenu - menu "CPUIdle driver" source "drivers/cpuidle/Kconfig"
arch/powerpc/platforms/pasemi/Makefile +0 -1
@@ -1,3 +1,2 @@ obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o misc.o obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o -obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o
arch/powerpc/platforms/powermac/Makefile +0 -2
@@ -9,8 +9,6 @@ obj-y += pic.o setup.o time.o feature.o pci.o \ sleep.o low_i2c.o cache.o pfunc_core.o \ pfunc_base.o udbg_scc.o udbg_adb.o obj-$(CONFIG_PMAC_BACKLIGHT) += backlight.o -obj-$(CONFIG_CPU_FREQ_PMAC) += cpufreq_32.o -obj-$(CONFIG_CPU_FREQ_PMAC64) += cpufreq_64.o # CONFIG_NVRAM is an arch. independent tristate symbol, for pmac32 we really # need this to be a bool. Cheat here and pretend CONFIG_NVRAM=m is really # CONFIG_NVRAM=y
drivers/cpufreq/Kconfig.powerpc +26 -0
@@ -5,3 +5,29 @@ config CPU_FREQ_MAPLE help This adds support for frequency switching on Maple 970FX Evaluation Board and compatible boards (IBM JS2x blades). + +config CPU_FREQ_PMAC + bool "Support for Apple PowerBooks" + depends on ADB_PMU && PPC32 + select CPU_FREQ_TABLE + help + This adds support for frequency switching on Apple PowerBooks, + this currently includes some models of iBook & Titanium + PowerBook. + +config CPU_FREQ_PMAC64 + bool "Support for some Apple G5s" + depends on PPC_PMAC && PPC64 + select CPU_FREQ_TABLE + help + This adds support for frequency switching on Apple iMac G5, + and some of the more recent desktop G5 machines as well. + +config PPC_PASEMI_CPUFREQ + bool "Support for PA Semi PWRficient" + depends on PPC_PASEMI + select CPU_FREQ_TABLE + default y + help + This adds the support for frequency switching on PA Semi + PWRficient processors.
drivers/cpufreq/Makefile +3 -0
@@ -79,6 +79,9 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o ################################################################################## # PowerPC platform drivers obj-$(CONFIG_CPU_FREQ_MAPLE) += maple-cpufreq.o +obj-$(CONFIG_CPU_FREQ_PMAC) += pmac32-cpufreq.o +obj-$(CONFIG_CPU_FREQ_PMAC64) += pmac64-cpufreq.o +obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += pasemi-cpufreq.o ################################################################################## # Other platform drivers
drivers/cpufreq/pasemi-cpufreq.c renamed from arch/powerpc/platforms/pasemi/cpufreq.c +0 -0
drivers/cpufreq/pmac32-cpufreq.c renamed from arch/powerpc/platforms/powermac/cpufreq_32.c +0 -0
drivers/cpufreq/pmac64-cpufreq.c renamed from arch/powerpc/platforms/powermac/cpufreq_64.c +0 -0
Signature · 1 line
1.7.12.rc2.18.g61b472e
Viresh Kumar
maintainerRe: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 10 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.
Quoted 12 lines
arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)
Hi Deepthi,
Can you help testing this please?
Viresh Kumar
maintainerRe: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 24 lines · Viresh Kumar
Quoted 10 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.Quoted 12 lines
arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)
Quoted 3 lines
Hi Deepthi,
Can you help testing this please?
Ping!!
Viresh Kumar
maintainerRe: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 25 lines · Viresh Kumar
Quoted 24 lines · Viresh Kumar
Quoted 22 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)
Quoted 5 lines
Quoted 3 lines
Hi Deepthi,
Can you help testing this please?
Ping!!
Ping!!
Viresh Kumar
maintainerRe: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 26 lines · Viresh Kumar
Quoted 25 lines · Viresh Kumar
Quoted 24 lines · Viresh Kumar
Quoted 22 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Hi Deepthi,
Can you help testing this please?
Ping!!
Ping!!
Hi Benjamin,
Hope you are back from your vacations. Can you give it a try now?
Viresh Kumar
maintainerRe: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 31 lines · Viresh Kumar
Quoted 30 lines · Viresh Kumar
Quoted 29 lines · Viresh Kumar
Quoted 27 lines · Viresh Kumar
Quoted 10 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.Quoted 12 lines
arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)Hi Deepthi,
Can you help testing this please?
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Ping!!
Ping!!
Hi Benjamin,
Hope you are back from your vacations. Can you give it a try now?
Ping!!
Viresh Kumar
maintainerRe: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 34 lines · Viresh Kumar
Quoted 33 lines · Viresh Kumar
Quoted 32 lines · Viresh Kumar
Quoted 30 lines · Viresh Kumar
Quoted 24 lines · Viresh Kumar
Quoted 10 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.Quoted 12 lines
arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)Quoted 3 lines
Hi Deepthi,
Can you help testing this please?
Ping!!
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Ping!!
Hi Benjamin,
Hope you are back from your vacations. Can you give it a try now?
Ping!!
Ping!!
Viresh Kumar
maintainerRe: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 37 lines · Viresh Kumar
Quoted 36 lines · Viresh Kumar
Quoted 35 lines · Viresh Kumar
Quoted 33 lines · Viresh Kumar
Quoted 25 lines · Viresh Kumar
Quoted 24 lines · Viresh Kumar
Quoted 22 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)Quoted 5 lines
Quoted 3 lines
Hi Deepthi,
Can you help testing this please?
Ping!!
Ping!!
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Hi Benjamin,
Hope you are back from your vacations. Can you give it a try now?
Ping!!
Ping!!
Hi Rafael,
Its been more than 2 months now that this patch was first posted. And the response from Maintainers isn't so great, irrespective of how many times I pinged them.
This is what I think:
- It looked functionally correct to Benjamin but he wanted somebody to actually test it.
- Arnd gave his Ack (So it looked functionally correct to him too)
- We can probably push this into linux-next now and see if somebody complains of any breakage it has done. If not we can get it pushed for 3.11.
--
viresh
Re: [PATCH 17/18] cpufreq: powerpc: move cpufreq driver to drivers/cpufreq
Quoted 52 lines · Viresh Kumar
Quoted 37 lines · Viresh Kumar
Quoted 36 lines · Viresh Kumar
Quoted 35 lines · Viresh Kumar
Quoted 33 lines · Viresh Kumar
Quoted 25 lines · Viresh Kumar
Quoted 24 lines · Viresh Kumar
Quoted 22 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platform to
drivers/cpufreq.Cc Benjamin Herrenschmidt <[email protected]>Cc Paul Mackerras <[email protected]>Cc Olof Johansson <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.arch/powerpc/platforms/Kconfig | 31 ---------------------- arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 -- drivers/cpufreq/Kconfig.powerpc | 26 ++++++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 8 files changed, 29 insertions(+), 34 deletions(-) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%)Quoted 5 lines
Quoted 3 lines
Hi Deepthi,
Can you help testing this please?
Ping!!
Ping!!
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Hi Benjamin,
Hope you are back from your vacations. Can you give it a try now?
Ping!!
Ping!!
Hi Rafael,
Its been more than 2 months now that this patch was first posted. And the response from Maintainers isn't so great, irrespective of how many times I pinged them.
Quoted 7 lines
This is what I think:
- It looked functionally correct to Benjamin but he wanted somebody to actually test it.
- Arnd gave his Ack (So it looked functionally correct to him too)
- We can probably push this into linux-next now and see if somebody complains of any breakage it has done. If not we can get it pushed for 3.11.
I agree, applied to bleeding-edge.
Thanks,
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Viresh Kumar
maintainerPATCH 18/18 cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq
In reply to Viresh KumarThis patch moves cpufreq driver of powerpc platforms/cell to drivers/cpufreq.
---
Compile Tested only.
arch/powerpc/platforms/cell/Kconfig | 26 +--------------------- arch/powerpc/platforms/cell/Makefile | 3 --- drivers/cpufreq/Kconfig.powerpc | 18 +++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq/ppc_cbe_cpufreq.c | 2 +- .../cpufreq/ppc_cbe_cpufreq_pervasive.c | 3 +-- .../cpufreq/ppc_cbe_cpufreq_pmi.c | 3 +-- .../linux/ppc_cbe_cpufreq.h | 4 ++-- 8 files changed, 27 insertions(+), 35 deletions(-) rename arch/powerpc/platforms/cell/cbe_cpufreq.c => drivers/cpufreq/ppc_cbe_cpufreq.c (99%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c => drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c (98%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c => drivers/cpufreq/ppc_cbe_cpufreq_pmi.c (99%) rename arch/powerpc/platforms/cell/cbe_cpufreq.h => include/linux/ppc_cbe_cpufreq.h (82%)
arch/powerpc/platforms/cell/Kconfig +1 -25
@@ -113,34 +113,10 @@ config CBE_THERM default m depends on CBE_RAS && SPU_BASE -config CBE_CPUFREQ - tristate "CBE frequency scaling" - depends on CBE_RAS && CPU_FREQ - default m - help - This adds the cpufreq driver for Cell BE processors. - For details, take a look at <file:Documentation/cpu-freq/>. - If you don't have such processor, say N - -config CBE_CPUFREQ_PMI_ENABLE - bool "CBE frequency scaling using PMI interface" - depends on CBE_CPUFREQ - default n - help - Select this, if you want to use the PMI interface - to switch frequencies. Using PMI, the - processor will not only be able to run at lower speed, - but also at lower core voltage. - -config CBE_CPUFREQ_PMI - tristate - depends on CBE_CPUFREQ_PMI_ENABLE - default CBE_CPUFREQ - config PPC_PMI tristate default y - depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON + depends on CPU_FREQ_CBE_PMI || PPC_IBM_CELL_POWERBUTTON help PMI (Platform Management Interrupt) is a way to communicate with the BMC (Baseboard Management Controller).
arch/powerpc/platforms/cell/Makefile +0 -3
@@ -5,9 +5,6 @@ obj-$(CONFIG_PPC_CELL_NATIVE) += iommu.o setup.o spider-pic.o \ obj-$(CONFIG_CBE_RAS) += ras.o obj-$(CONFIG_CBE_THERM) += cbe_thermal.o -obj-$(CONFIG_CBE_CPUFREQ_PMI) += cbe_cpufreq_pmi.o -obj-$(CONFIG_CBE_CPUFREQ) += cbe-cpufreq.o -cbe-cpufreq-y += cbe_cpufreq_pervasive.o cbe_cpufreq.o obj-$(CONFIG_CBE_CPUFREQ_SPU_GOVERNOR) += cpufreq_spudemand.o obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON) += cbe_powerbutton.o
drivers/cpufreq/Kconfig.powerpc +18 -0
@@ -1,3 +1,21 @@ +config CPU_FREQ_CBE + tristate "CBE frequency scaling" + depends on CBE_RAS && PPC_CELL + default m + help + This adds the cpufreq driver for Cell BE processors. + For details, take a look at <file:Documentation/cpu-freq/>. + If you don't have such processor, say N + +config CPU_FREQ_CBE_PMI + bool "CBE frequency scaling using PMI interface" + depends on CPU_FREQ_CBE + default n + help + Select this, if you want to use the PMI interface to switch + frequencies. Using PMI, the processor will not only be able to run at + lower speed, but also at lower core voltage. + config CPU_FREQ_MAPLE bool "Support for Maple 970FX Evaluation Board" depends on PPC_MAPLE
drivers/cpufreq/Makefile +3 -0
@@ -78,6 +78,9 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o ################################################################################## # PowerPC platform drivers +obj-$(CONFIG_CPU_FREQ_CBE) += ppc-cbe-cpufreq.o +ppc-cbe-cpufreq-y += ppc_cbe_cpufreq_pervasive.o ppc_cbe_cpufreq.o +obj-$(CONFIG_CPU_FREQ_CBE_PMI) += ppc_cbe_cpufreq_pmi.o obj-$(CONFIG_CPU_FREQ_MAPLE) += maple-cpufreq.o obj-$(CONFIG_CPU_FREQ_PMAC) += pmac32-cpufreq.o obj-$(CONFIG_CPU_FREQ_PMAC64) += pmac64-cpufreq.o
drivers/cpufreq/ppc_cbe_cpufreq.c renamed from arch/powerpc/platforms/cell/cbe_cpufreq.c +1 -1
@@ -23,11 +23,11 @@#include <linux/cpufreq.h> #include <linux/module.h> #include <linux/of_platform.h> +#include <linux/ppc_cbe_cpufreq.h> #include <asm/machdep.h> #include <asm/prom.h> #include <asm/cell-regs.h> -#include "cbe_cpufreq.h" static DEFINE_MUTEX (cbe_switch_mutex);
drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c renamed from arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c +1 -2
@@ -25,13 +25,12 @@#include <linux/io.h> #include <linux/kernel.h> +#include <linux/ppc_cbe_cpufreq.h> #include <linux/time.h> #include <asm/machdep.h> #include <asm/hw_irq.h> #include <asm/cell-regs.h> -#include "cbe_cpufreq.h" -/* to write to MIC register */ static u64 MIC_Slow_Fast_Timer_table[] = { [0 ...7 ] =0x007fc00000000000ull ,
drivers/cpufreq/ppc_cbe_cpufreq_pmi.c renamed from arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c +1 -2
@@ -25,6 +25,7 @@#include <linux/timer.h> #include <linux/module.h> #include <linux/of_platform.h> +#include <linux/ppc_cbe_cpufreq.h> #include <asm/processor.h> #include <asm/prom.h>
@@ -35,8 +36,6 @@#include <asm/time.h> #endif -#include "cbe_cpufreq.h" -static u8 pmi_slow_mode_limit[MAX_CBE ];bool cbe_cpufreq_has_pmi = false;
include/linux/ppc_cbe_cpufreq.h renamed from arch/powerpc/platforms/cell/cbe_cpufreq.h +2 -2
@@ -1,5 +1,5 @@/* -* cbe_cpufreq.h +* ppc_cbe_cpufreq.h * * This file contains the definitions used by the cbe_cpufreq driver. *
@@ -17,7 +17,7 @@ int cbe_cpufreq_get_pmode(int cpu);int cbe_cpufreq_set_pmode_pmi (int cpu,unsigned int pmode); -#if defined(CONFIG_CBE_CPUFREQ_PMI ) || defined(CONFIG_CBE_CPUFREQ_PMI_MODULE ) +#if defined(CONFIG_CPU_FREQ_CBE_PMI ) || defined(CONFIG_CPU_FREQ_CBE_PMI_MODULE )extern bool cbe_cpufreq_has_pmi;#else #define cbe_cpufreq_has_pmi (0)
Signature · 1 line
1.7.12.rc2.18.g61b472e
Re: [PATCH 18/18] cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq
Quoted 9 lines · Viresh Kumar
This patch moves cpufreq driver of powerpc platforms/cell to
drivers/cpufreq.Cc Arnd Bergmann <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>Signed-off-by Viresh Kumar <[email protected]>---
Compile Tested only.
Quoted 8 lines
arch/powerpc/platforms/cell/Kconfig | 26 +--------------------- arch/powerpc/platforms/cell/Makefile | 3 --- drivers/cpufreq/Kconfig.powerpc | 18 +++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq/ppc_cbe_cpufreq.c | 2 +- .../cpufreq/ppc_cbe_cpufreq_pervasive.c | 3 +-- .../cpufreq/ppc_cbe_cpufreq_pmi.c | 3 +-- .../linux/ppc_cbe_cpufreq.h | 4 ++--
Moving the files is good, but I don't see a reason to make the cbe_cpufreq.h header globally visible in include/linux/. Isn't it just used by as the interface between ppc_cbe_cpufreq_pmi.c and ppc_cbe_cpufreq.c?
Arnd
Viresh Kumar
maintainerRe: [PATCH 18/18] cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq
Quoted 3 lines · Arnd Bergmann
Moving the files is good, but I don't see a reason to make the
cbe_cpufreq.hheader globally visible ininclude/linux/. Isn't it just used by as the interface betweenppc_cbe_cpufreq_pmi.candppc_cbe_cpufreq.c?
When i moved it initially i thought it is also used by arch/powerpc/platforms/cell/cpufreq_spudemand.c and hence moved it to include/linux and never realized i am wrong..
Here is the fixup (And attached complete patch: original+fixup for Rafael to apply):
Compile tested only.
---
drivers/cpufreq/ppc_cbe_cpufreq.c | 3 ++-
{include/linux => drivers/cpufreq}/ppc_cbe_cpufreq.h | 0
drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c | 3 ++-
drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 3 ++-
4 files changed, 6 insertions(+), 3 deletions(-)
rename {include/linux => drivers/cpufreq}/ppc_cbe_cpufreq.h (100%)(quoted diff) +0 -0
b/drivers/cpufreq/ppc_cbe_cpufreq.c
index 138d88c..56e0c17 100644
drivers/cpufreq/ppc_cbe_cpufreq.c +2 -1
@@ -23,12 +23,13 @@#include <linux/cpufreq.h> #include <linux/module.h> #include <linux/of_platform.h> -#include <linux/ppc_cbe_cpufreq.h> #include <asm/machdep.h> #include <asm/prom.h> #include <asm/cell-regs.h> +#include "ppc_cbe_cpufreq.h" +static DEFINE_MUTEX (cbe_switch_mutex);
drivers/cpufreq/ppc_cbe_cpufreq.h renamed from include/linux/ppc_cbe_cpufreq.h +0 -0
(quoted diff) +0 -0
b/drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c
index 6708710..84d2f2c 100644
drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c +2 -1
@@ -25,12 +25,13 @@#include <linux/io.h> #include <linux/kernel.h> -#include <linux/ppc_cbe_cpufreq.h> #include <linux/time.h> #include <asm/machdep.h> #include <asm/hw_irq.h> #include <asm/cell-regs.h> +#include "ppc_cbe_cpufreq.h" +/* to write to MIC register */ static u64 MIC_Slow_Fast_Timer_table[] = { [0 ...7 ] =0x007fc00000000000ull ,
(quoted diff) +0 -0
b/drivers/cpufreq/ppc_cbe_cpufreq_pmi.c
index 448b888..d29e8da 100644
drivers/cpufreq/ppc_cbe_cpufreq_pmi.c +2 -1
@@ -25,7 +25,6 @@#include <linux/timer.h> #include <linux/module.h> #include <linux/of_platform.h> -#include <linux/ppc_cbe_cpufreq.h> #include <asm/processor.h> #include <asm/prom.h>
@@ -36,6 +35,8 @@#include <asm/time.h> #endif +#include "ppc_cbe_cpufreq.h" +static u8 pmi_slow_mode_limit[MAX_CBE ];bool cbe_cpufreq_has_pmi = false;
From 47275a6b874359f1b42fbea3e9d10372049ee6c6 Mon Sep 17 00:00:00 2001
Message-Id: <47275a6b874359f1b42fbea3e9d10372049ee6c6.1365083336.git.viresh.kumar@linaro.org>
From: Viresh Kumar <[email protected]>
Date: Mon, 25 Mar 2013 11:20:23 +0530
Subject: [PATCH] cpufreq: powerpc/platforms/cell: move cpufreq driver to
drivers/cpufreq
This patch moves cpufreq driver of powerpc platforms/cell to drivers/cpufreq.
--- arch/powerpc/platforms/cell/Kconfig | 26 +--------------------- arch/powerpc/platforms/cell/Makefile | 3 --- drivers/cpufreq/Kconfig.powerpc | 18 +++++++++++++++ drivers/cpufreq/Makefile | 3 +++ .../cpufreq/ppc_cbe_cpufreq.c | 3 ++- .../cpufreq/ppc_cbe_cpufreq.h | 4 ++-- .../cpufreq/ppc_cbe_cpufreq_pervasive.c | 2 +- .../cpufreq/ppc_cbe_cpufreq_pmi.c | 2 +- 8 files changed, 28 insertions(+), 33 deletions(-) rename arch/powerpc/platforms/cell/cbe_cpufreq.c => drivers/cpufreq/ppc_cbe_cpufreq.c (99%) rename arch/powerpc/platforms/cell/cbe_cpufreq.h => drivers/cpufreq/ppc_cbe_cpufreq.h (82%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c => drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c (99%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c => drivers/cpufreq/ppc_cbe_cpufreq_pmi.c (99%)
arch/powerpc/platforms/cell/Kconfig +1 -25
@@ -113,34 +113,10 @@ config CBE_THERM default m depends on CBE_RAS && SPU_BASE -config CBE_CPUFREQ - tristate "CBE frequency scaling" - depends on CBE_RAS && CPU_FREQ - default m - help - This adds the cpufreq driver for Cell BE processors. - For details, take a look at <file:Documentation/cpu-freq/>. - If you don't have such processor, say N - -config CBE_CPUFREQ_PMI_ENABLE - bool "CBE frequency scaling using PMI interface" - depends on CBE_CPUFREQ - default n - help - Select this, if you want to use the PMI interface - to switch frequencies. Using PMI, the - processor will not only be able to run at lower speed, - but also at lower core voltage. - -config CBE_CPUFREQ_PMI - tristate - depends on CBE_CPUFREQ_PMI_ENABLE - default CBE_CPUFREQ - config PPC_PMI tristate default y - depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON + depends on CPU_FREQ_CBE_PMI || PPC_IBM_CELL_POWERBUTTON help PMI (Platform Management Interrupt) is a way to communicate with the BMC (Baseboard Management Controller).
arch/powerpc/platforms/cell/Makefile +0 -3
@@ -5,9 +5,6 @@ obj-$(CONFIG_PPC_CELL_NATIVE) += iommu.o setup.o spider-pic.o \ obj-$(CONFIG_CBE_RAS) += ras.o obj-$(CONFIG_CBE_THERM) += cbe_thermal.o -obj-$(CONFIG_CBE_CPUFREQ_PMI) += cbe_cpufreq_pmi.o -obj-$(CONFIG_CBE_CPUFREQ) += cbe-cpufreq.o -cbe-cpufreq-y += cbe_cpufreq_pervasive.o cbe_cpufreq.o obj-$(CONFIG_CBE_CPUFREQ_SPU_GOVERNOR) += cpufreq_spudemand.o obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON) += cbe_powerbutton.o
drivers/cpufreq/Kconfig.powerpc +18 -0
@@ -1,3 +1,21 @@ +config CPU_FREQ_CBE + tristate "CBE frequency scaling" + depends on CBE_RAS && PPC_CELL + default m + help + This adds the cpufreq driver for Cell BE processors. + For details, take a look at <file:Documentation/cpu-freq/>. + If you don't have such processor, say N + +config CPU_FREQ_CBE_PMI + bool "CBE frequency scaling using PMI interface" + depends on CPU_FREQ_CBE + default n + help + Select this, if you want to use the PMI interface to switch + frequencies. Using PMI, the processor will not only be able to run at + lower speed, but also at lower core voltage. + config CPU_FREQ_MAPLE bool "Support for Maple 970FX Evaluation Board" depends on PPC_MAPLE
drivers/cpufreq/Makefile +3 -0
@@ -78,6 +78,9 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o ################################################################################## # PowerPC platform drivers +obj-$(CONFIG_CPU_FREQ_CBE) += ppc-cbe-cpufreq.o +ppc-cbe-cpufreq-y += ppc_cbe_cpufreq_pervasive.o ppc_cbe_cpufreq.o +obj-$(CONFIG_CPU_FREQ_CBE_PMI) += ppc_cbe_cpufreq_pmi.o obj-$(CONFIG_CPU_FREQ_MAPLE) += maple-cpufreq.o obj-$(CONFIG_CPU_FREQ_PMAC) += pmac32-cpufreq.o obj-$(CONFIG_CPU_FREQ_PMAC64) += pmac64-cpufreq.o
drivers/cpufreq/ppc_cbe_cpufreq.c renamed from arch/powerpc/platforms/cell/cbe_cpufreq.c +2 -1
@@ -27,7 +27,8 @@#include <asm/machdep.h> #include <asm/prom.h> #include <asm/cell-regs.h> -#include "cbe_cpufreq.h" + +#include "ppc_cbe_cpufreq.h" static DEFINE_MUTEX (cbe_switch_mutex);
drivers/cpufreq/ppc_cbe_cpufreq.h renamed from arch/powerpc/platforms/cell/cbe_cpufreq.h +2 -2
@@ -1,5 +1,5 @@/* -* cbe_cpufreq.h +* ppc_cbe_cpufreq.h * * This file contains the definitions used by the cbe_cpufreq driver. *
@@ -17,7 +17,7 @@ int cbe_cpufreq_get_pmode(int cpu);int cbe_cpufreq_set_pmode_pmi (int cpu,unsigned int pmode); -#if defined(CONFIG_CBE_CPUFREQ_PMI ) || defined(CONFIG_CBE_CPUFREQ_PMI_MODULE ) +#if defined(CONFIG_CPU_FREQ_CBE_PMI ) || defined(CONFIG_CPU_FREQ_CBE_PMI_MODULE )extern bool cbe_cpufreq_has_pmi;#else #define cbe_cpufreq_has_pmi (0)
drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c renamed from arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c +1 -1
@@ -30,7 +30,7 @@#include <asm/hw_irq.h> #include <asm/cell-regs.h> -#include "cbe_cpufreq.h" +#include "ppc_cbe_cpufreq.h" /* to write to MIC register */ static u64 MIC_Slow_Fast_Timer_table[] = {
drivers/cpufreq/ppc_cbe_cpufreq_pmi.c renamed from arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c +1 -1
@@ -35,7 +35,7 @@#include <asm/time.h> #endif -#include "cbe_cpufreq.h" +#include "ppc_cbe_cpufreq.h" static u8 pmi_slow_mode_limit[MAX_CBE ];
Signature · 1 line
1.7.12.rc2.18.g61b472e
Arnd Bergmann
Acked-byRe: [PATCH 18/18] cpufreq: powerpc/platforms/cell: move cpufreq driver to drivers/cpufreq
Quoted 6 lines · Viresh Kumar
Quoted 3 lines · Arnd Bergmann
Moving the files is good, but I don't see a reason to make the
cbe_cpufreq.hheader globally visible ininclude/linux/. Isn't it just used by as the interface betweenppc_cbe_cpufreq_pmi.candppc_cbe_cpufreq.c?
Quoted 6 lines
When i moved it initially i thought it is also used by
arch/powerpc/platforms/cell/cpufreq_spudemand.cand hence moved it toinclude/linuxand never realized i am wrong..Here is the fixup (And attached complete patch: original+fixup for Rafael to apply):
Quoted 7 lines · Viresh Kumar
Hi Rafael,
These are all the remaining patches i have for 3.10. All of them have received Acks from their maintainers leaving powerpc ones. I have got an additional patch for powerpc (18) this time, it was the only driver left out of
drivers/cpufreq.Please consider them for applying to your bleeding-edge or linux-next.
Patches [1-16/18] plus the fixed-up [18/18] (slightly modified due to the ordering change) applied to bleeding-edge. For [17/18] I need an ACK from the powerpc side.
Thanks,
Rafael
Quoted 155 lines
-------------x--------------x-------------
This patchset targets towards moving all platform specific cpufreq drivers to
drivers/cpufreq. This will lead to better consolidation code in future too.All ARM and powerpc patches are compile tested by me.
Changes since earlier version:
- Additional patch 18/18Viresh Kumar (18):
cpufreq: ARM: Arrange drivers in alphabetical order
cpufreq: tegra: Move driver todrivers/cpufreq
cpufreq: davinci: move cpufreq driver todrivers/cpufreq
cpufreq: pxa3xx: move cpufreq driver todrivers/cpufreq
cpufreq: pxa2xx: move cpufreq driver todrivers/cpufreq
cpufreq: integrator: move cpufreq driver todrivers/cpufreq
cpufreq: s3c24xx: move cpufreq driver todrivers/cpufreq
cpufreq: sa11x0: move cpufreq driver todrivers/cpufreq
cpufreq: AVR32: move cpufreq driver todrivers/cpufreq
cpufreq: blackfin: move cpufreq driver todrivers/cpufreq
cpufreq: cris: move cpufreq driver todrivers/cpufreq
cpufreq: ia64: move cpufreq driver todrivers/cpufreq
cpufreq: mips: move cpufreq driver todrivers/cpufreq
cpufreq: sh: move cpufreq driver todrivers/cpufreq
cpufreq: unicore2: move cpufreq driver todrivers/cpufreq
cpufreq: sparc: move cpufreq driver todrivers/cpufreq
cpufreq: powerpc: move cpufreq driver todrivers/cpufreq
cpufreq: powerpc/platforms/cell: move cpufreq driver to
drivers/cpufreqarch/arm/Kconfig | 72 -------- arch/arm/mach-davinci/Makefile | 1 - arch/arm/mach-integrator/Makefile | 1 - arch/arm/mach-pxa/Makefile | 6 - arch/arm/mach-pxa/include/mach/generic.h | 1 + arch/arm/mach-s3c24xx/Kconfig | 66 +++----- arch/arm/mach-s3c24xx/Makefile | 6 - arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h | 0 arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +- arch/arm/mach-sa1100/Kconfig | 26 +-- arch/arm/mach-sa1100/Makefile | 3 - arch/arm/mach-sa1100/include/mach/generic.h | 1 + arch/arm/mach-tegra/Makefile | 1 - arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 +- arch/arm/plat-samsung/include/plat/cpu-freq.h | 6 +- arch/avr32/Kconfig | 13 -- arch/avr32/configs/atngw100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd100_defconfig | 2 +- arch/avr32/configs/atngw100_evklcd101_defconfig | 2 +- arch/avr32/configs/atngw100_mrmt_defconfig | 2 +- arch/avr32/configs/atngw100mkii_defconfig | 2 +- .../avr32/configs/atngw100mkii_evklcd100_defconfig | 2 +- .../avr32/configs/atngw100mkii_evklcd101_defconfig | 2 +- arch/avr32/configs/atstk1002_defconfig | 2 +- arch/avr32/configs/atstk1003_defconfig | 2 +- arch/avr32/configs/atstk1004_defconfig | 2 +- arch/avr32/configs/atstk1006_defconfig | 2 +- arch/avr32/configs/favr-32_defconfig | 2 +- arch/avr32/configs/hammerhead_defconfig | 2 +- arch/avr32/configs/mimc200_defconfig | 2 +- arch/avr32/mach-at32ap/Makefile | 1 - arch/blackfin/mach-common/Makefile | 1 - arch/cris/arch-v32/mach-a3/Makefile | 1 - arch/cris/arch-v32/mach-fs/Makefile | 1 - arch/ia64/Kconfig | 6 +- arch/ia64/kernel/Makefile | 1 - arch/ia64/kernel/cpufreq/Kconfig | 29 ---- arch/ia64/kernel/cpufreq/Makefile | 2 - arch/mips/Kconfig | 9 +- arch/mips/kernel/Makefile | 2 - arch/mips/kernel/cpufreq/Kconfig | 41 ----- arch/mips/kernel/cpufreq/Makefile | 5 - arch/powerpc/platforms/Kconfig | 31 ---- arch/powerpc/platforms/cell/Kconfig | 26 +-- arch/powerpc/platforms/cell/Makefile | 3 - arch/powerpc/platforms/pasemi/Makefile | 1 - arch/powerpc/platforms/powermac/Makefile | 2 - arch/sh/Kconfig | 18 -- arch/sh/kernel/Makefile | 1 - arch/sparc/Kconfig | 23 --- arch/sparc/kernel/Makefile | 3 - arch/unicore32/kernel/Makefile | 1 - drivers/cpufreq/Kconfig | 89 ++++++++++ drivers/cpufreq/Kconfig.arm | 184 ++++++++++++++------- drivers/cpufreq/Kconfig.powerpc | 44 +++++ drivers/cpufreq/Makefile | 42 ++++- .../cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c | 0 .../cpufreq/blackfin-cpufreq.c | 0 .../cpufreq/cris-artpec3-cpufreq.c | 0 .../cpufreq/cris-etraxfs-cpufreq.c | 0 .../cpufreq.c => drivers/cpufreq/davinci-cpufreq.c | 2 - .../cpufreq/ia64-acpi-cpufreq.c | 1 - .../cpu.c => drivers/cpufreq/integrator-cpufreq.c | 2 - .../kernel => drivers}/cpufreq/loongson2_cpufreq.c | 0 .../cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c | 0 .../cpufreq/pmac32-cpufreq.c | 0 .../cpufreq/pmac64-cpufreq.c | 0 .../cpufreq/ppc_cbe_cpufreq.c | 2 +- .../cpufreq/ppc_cbe_cpufreq_pervasive.c | 3 +- .../cpufreq/ppc_cbe_cpufreq_pmi.c | 3 +- .../cpufreq/pxa2xx-cpufreq.c | 2 - .../cpufreq/pxa3xx-cpufreq.c | 5 +- .../cpufreq/s3c2410-cpufreq.c | 0 .../cpufreq/s3c2412-cpufreq.c | 3 +- .../cpufreq/s3c2440-cpufreq.c | 0 .../cpufreq/s3c24xx-cpufreq-debugfs.c | 0 .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c | 0 .../cpufreq/sa1100-cpufreq.c | 3 +- .../cpufreq/sa1110-cpufreq.c | 3 +- .../cpufreq.c => drivers/cpufreq/sh-cpufreq.c | 2 - .../cpufreq/sparc-us2e-cpufreq.c | 0 .../cpufreq/sparc-us3-cpufreq.c | 0 .../cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c | 2 - .../cpufreq/unicore2-cpufreq.c | 2 +- .../linux/ppc_cbe_cpufreq.h | 4 +- 85 files changed, 385 insertions(+), 464 deletions(-) create mode 100644 arch/arm/mach-pxa/include/mach/generic.h rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%) create mode 100644 arch/arm/mach-sa1100/include/mach/generic.h delete mode 100644 arch/ia64/kernel/cpufreq/Kconfig delete mode 100644 arch/ia64/kernel/cpufreq/Makefile delete mode 100644 arch/mips/kernel/cpufreq/Kconfig delete mode 100644 arch/mips/kernel/cpufreq/Makefile rename arch/avr32/mach-at32ap/cpufreq.c => drivers/cpufreq/at32ap-cpufreq.c (100%) rename arch/blackfin/mach-common/cpufreq.c => drivers/cpufreq/blackfin-cpufreq.c (100%) rename arch/cris/arch-v32/mach-a3/cpufreq.c => drivers/cpufreq/cris-artpec3-cpufreq.c (100%) rename arch/cris/arch-v32/mach-fs/cpufreq.c => drivers/cpufreq/cris-etraxfs-cpufreq.c (100%) rename arch/arm/mach-davinci/cpufreq.c => drivers/cpufreq/davinci-cpufreq.c (99%) rename arch/ia64/kernel/cpufreq/acpi-cpufreq.c => drivers/cpufreq/ia64-acpi-cpufreq.c (99%) rename arch/arm/mach-integrator/cpu.c => drivers/cpufreq/integrator-cpufreq.c (99%) rename {arch/mips/kernel => drivers}/cpufreq/loongson2_cpufreq.c (100%) rename arch/powerpc/platforms/pasemi/cpufreq.c => drivers/cpufreq/pasemi-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_32.c => drivers/cpufreq/pmac32-cpufreq.c (100%) rename arch/powerpc/platforms/powermac/cpufreq_64.c => drivers/cpufreq/pmac64-cpufreq.c (100%) rename arch/powerpc/platforms/cell/cbe_cpufreq.c => drivers/cpufreq/ppc_cbe_cpufreq.c (99%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c => drivers/cpufreq/ppc_cbe_cpufreq_pervasive.c (98%) rename arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c => drivers/cpufreq/ppc_cbe_cpufreq_pmi.c (99%) rename arch/arm/mach-pxa/cpufreq-pxa2xx.c => drivers/cpufreq/pxa2xx-cpufreq.c (99%) rename arch/arm/mach-pxa/cpufreq-pxa3xx.c => drivers/cpufreq/pxa3xx-cpufreq.c (98%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => drivers/cpufreq/s3c2410-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => drivers/cpufreq/s3c2412-cpufreq.c (99%) rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => drivers/cpufreq/s3c2440-cpufreq.c (100%) rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%) rename arch/arm/mach-s3c24xx/cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c (100%) rename arch/arm/mach-sa1100/cpu-sa1100.c => drivers/cpufreq/sa1100-cpufreq.c (99%) rename arch/arm/mach-sa1100/cpu-sa1110.c => drivers/cpufreq/sa1110-cpufreq.c (99%) rename arch/sh/kernel/cpufreq.c => drivers/cpufreq/sh-cpufreq.c (99%) rename arch/sparc/kernel/us2e_cpufreq.c => drivers/cpufreq/sparc-us2e-cpufreq.c (100%) rename arch/sparc/kernel/us3_cpufreq.c => drivers/cpufreq/sparc-us3-cpufreq.c (100%) rename arch/arm/mach-tegra/cpu-tegra.c => drivers/cpufreq/tegra-cpufreq.c (99%) rename arch/unicore32/kernel/cpu-ucv2.c => drivers/cpufreq/unicore2-cpufreq.c (96%) rename arch/powerpc/platforms/cell/cbe_cpufreq.h => include/linux/ppc_cbe_cpufreq.h (82%)
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Viresh Kumar
maintainerQuoted 7 lines · Rafael J. Wysocki
Quoted 6 lines · Viresh Kumar
Hi Rafael,
These are all the remaining patches i have for 3.10. All of them have received Acks from their maintainers leaving powerpc ones. I have got an additional patch for powerpc (18) this time, it was the only driver left out of
drivers/cpufreq.
Quoted 5 lines
Quoted 1 line
Please consider them for applying to your bleeding-edge or linux-next.
Patches [1-16/18] plus the fixed-up [18/18] (slightly modified due to the ordering change) applied to bleeding-edge. For [17/18] I need an ACK from the powerpc side.
Thanks.