Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cpufreq: sa11x0: move cpufreq driver to drivers/cpufreq

This patch moves cpufreq driver of ARM based sa11x0 platform to drivers/cpufreq.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Viresh Kumar and committed by
Rafael J. Wysocki
59a2e613 b7e614c8

+24 -27
-7
arch/arm/Kconfig
··· 2150 2150 menu "CPU Power Management" 2151 2151 2152 2152 if ARCH_HAS_CPUFREQ 2153 - 2154 2153 source "drivers/cpufreq/Kconfig" 2155 2154 2156 2155 config CPU_FREQ_IMX ··· 2158 2159 select CPU_FREQ_TABLE 2159 2160 help 2160 2161 This enables the CPUfreq driver for i.MX CPUs. 2161 - 2162 - config CPU_FREQ_SA1100 2163 - bool 2164 - 2165 - config CPU_FREQ_SA1110 2166 - bool 2167 2162 2168 2163 config CPU_FREQ_S3C 2169 2164 bool
+13 -13
arch/arm/mach-sa1100/Kconfig
··· 4 4 5 5 config SA1100_ASSABET 6 6 bool "Assabet" 7 - select CPU_FREQ_SA1110 7 + select ARM_SA1110_CPUFREQ 8 8 help 9 9 Say Y here if you are using the Intel(R) StrongARM(R) SA-1110 10 10 Microprocessor Development Board (also known as the Assabet). ··· 20 20 21 21 config SA1100_CERF 22 22 bool "CerfBoard" 23 - select CPU_FREQ_SA1110 23 + select ARM_SA1110_CPUFREQ 24 24 help 25 25 The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued). 26 26 More information is available at: ··· 47 47 48 48 config SA1100_COLLIE 49 49 bool "Sharp Zaurus SL5500" 50 - # FIXME: select CPU_FREQ_SA11x0 50 + # FIXME: select ARM_SA11x0_CPUFREQ 51 51 select SHARP_LOCOMO 52 52 select SHARP_PARAM 53 53 select SHARP_SCOOP ··· 56 56 57 57 config SA1100_H3100 58 58 bool "Compaq iPAQ H3100" 59 - select CPU_FREQ_SA1110 59 + select ARM_SA1110_CPUFREQ 60 60 select HTC_EGPIO 61 61 help 62 62 Say Y here if you intend to run this kernel on the Compaq iPAQ ··· 67 67 68 68 config SA1100_H3600 69 69 bool "Compaq iPAQ H3600/H3700" 70 - select CPU_FREQ_SA1110 70 + select ARM_SA1110_CPUFREQ 71 71 select HTC_EGPIO 72 72 help 73 73 Say Y here if you intend to run this kernel on the Compaq iPAQ ··· 78 78 79 79 config SA1100_BADGE4 80 80 bool "HP Labs BadgePAD 4" 81 - select CPU_FREQ_SA1100 81 + select ARM_SA1100_CPUFREQ 82 82 select SA1111 83 83 help 84 84 Say Y here if you want to build a kernel for the HP Laboratories ··· 86 86 87 87 config SA1100_JORNADA720 88 88 bool "HP Jornada 720" 89 - # FIXME: select CPU_FREQ_SA11x0 89 + # FIXME: select ARM_SA11x0_CPUFREQ 90 90 select SA1111 91 91 help 92 92 Say Y here if you want to build a kernel for the HP Jornada 720 ··· 105 105 106 106 config SA1100_HACKKIT 107 107 bool "HackKit Core CPU Board" 108 - select CPU_FREQ_SA1100 108 + select ARM_SA1100_CPUFREQ 109 109 help 110 110 Say Y here to support the HackKit Core CPU Board 111 111 <http://hackkit.eletztrick.de>; 112 112 113 113 config SA1100_LART 114 114 bool "LART" 115 - select CPU_FREQ_SA1100 115 + select ARM_SA1100_CPUFREQ 116 116 help 117 117 Say Y here if you are using the Linux Advanced Radio Terminal 118 118 (also known as the LART). See <http://www.lartmaker.nl/> for ··· 120 120 121 121 config SA1100_NANOENGINE 122 122 bool "nanoEngine" 123 - select CPU_FREQ_SA1110 123 + select ARM_SA1110_CPUFREQ 124 124 select PCI 125 125 select PCI_NANOENGINE 126 126 help ··· 130 130 131 131 config SA1100_PLEB 132 132 bool "PLEB" 133 - select CPU_FREQ_SA1100 133 + select ARM_SA1100_CPUFREQ 134 134 help 135 135 Say Y here if you are using version 1 of the Portable Linux 136 136 Embedded Board (also known as PLEB). ··· 139 139 140 140 config SA1100_SHANNON 141 141 bool "Shannon" 142 - select CPU_FREQ_SA1100 142 + select ARM_SA1100_CPUFREQ 143 143 help 144 144 The Shannon (also known as a Tuxscreen, and also as a IS2630) was a 145 145 limited edition webphone produced by Philips. The Shannon is a SA1100 ··· 148 148 149 149 config SA1100_SIMPAD 150 150 bool "Simpad" 151 - select CPU_FREQ_SA1110 151 + select ARM_SA1110_CPUFREQ 152 152 help 153 153 The SIEMENS webpad SIMpad is based on the StrongARM 1110. There 154 154 are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB
-3
arch/arm/mach-sa1100/Makefile
··· 8 8 obj-n := 9 9 obj- := 10 10 11 - obj-$(CONFIG_CPU_FREQ_SA1100) += cpu-sa1100.o 12 - obj-$(CONFIG_CPU_FREQ_SA1110) += cpu-sa1110.o 13 - 14 11 # Specific board support 15 12 obj-$(CONFIG_SA1100_ASSABET) += assabet.o 16 13 obj-$(CONFIG_ASSABET_NEPONSET) += neponset.o
+1 -2
arch/arm/mach-sa1100/cpu-sa1100.c drivers/cpufreq/sa1100-cpufreq.c
··· 91 91 92 92 #include <asm/cputype.h> 93 93 94 + #include <mach/generic.h> 94 95 #include <mach/hardware.h> 95 - 96 - #include "generic.h" 97 96 98 97 struct sa1100_dram_regs { 99 98 int speed;
+1 -2
arch/arm/mach-sa1100/cpu-sa1110.c drivers/cpufreq/sa1110-cpufreq.c
··· 27 27 #include <asm/cputype.h> 28 28 #include <asm/mach-types.h> 29 29 30 + #include <mach/generic.h> 30 31 #include <mach/hardware.h> 31 - 32 - #include "generic.h" 33 32 34 33 #undef DEBUG 35 34
+1
arch/arm/mach-sa1100/include/mach/generic.h
··· 1 + #include "../../generic.h"
+6
drivers/cpufreq/Kconfig.arm
··· 127 127 128 128 If in doubt, say N. 129 129 130 + config ARM_SA1100_CPUFREQ 131 + bool 132 + 133 + config ARM_SA1110_CPUFREQ 134 + bool 135 + 130 136 config ARM_SPEAR_CPUFREQ 131 137 bool "SPEAr CPUFreq support" 132 138 depends on PLAT_SPEAR
+2
drivers/cpufreq/Makefile
··· 66 66 obj-$(CONFIG_ARM_S3C2416_CPUFREQ) += s3c2416-cpufreq.o 67 67 obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o 68 68 obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o 69 + obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o 70 + obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o 69 71 obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o 70 72 obj-$(CONFIG_ARCH_TEGRA) += tegra-cpufreq.o 71 73