aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTuomas Tynkkynen <ttynkkynen@nvidia.com>2015-05-13 10:58:47 -0400
committerThierry Reding <treding@nvidia.com>2015-07-16 03:34:08 -0400
commit109e13eaa40dfebf8893234cc5f1535a04e23acf (patch)
tree448bcd50a46334ae00a1a943712ca334846573fd
parent135796c9ccd3d6c53fbc3f6c4d73d8ba6820b739 (diff)
cpufreq: tegra: Rename tegra-cpufreq to tegra20-cpufreq
The Tegra124 will use a different driver for frequency scaling, so rename the old driver (which handles only Tegra20) appropriately. Signed-off-by: Tuomas Tynkkynen <ttynkkynen@nvidia.com> Signed-off-by: Mikko Perttunen <mikko.perttunen@kapsi.fi> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/cpufreq/Kconfig.arm6
-rw-r--r--drivers/cpufreq/Makefile2
-rw-r--r--drivers/cpufreq/tegra20-cpufreq.c (renamed from drivers/cpufreq/tegra-cpufreq.c)0
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index cc8a71c267b8..ef402869576f 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -247,12 +247,12 @@ config ARM_SPEAR_CPUFREQ
247 help 247 help
248 This adds the CPUFreq driver support for SPEAr SOCs. 248 This adds the CPUFreq driver support for SPEAr SOCs.
249 249
250config ARM_TEGRA_CPUFREQ 250config ARM_TEGRA20_CPUFREQ
251 bool "TEGRA CPUFreq support" 251 bool "Tegra20 CPUFreq support"
252 depends on ARCH_TEGRA 252 depends on ARCH_TEGRA
253 default y 253 default y
254 help 254 help
255 This adds the CPUFreq driver support for TEGRA SOCs. 255 This adds the CPUFreq driver support for Tegra20 SOCs.
256 256
257config ARM_PXA2xx_CPUFREQ 257config ARM_PXA2xx_CPUFREQ
258 tristate "Intel PXA2xx CPUfreq driver" 258 tristate "Intel PXA2xx CPUfreq driver"
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 2169bf792db7..d0b70ce56dd7 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -76,7 +76,7 @@ obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
76obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o 76obj-$(CONFIG_ARM_SA1100_CPUFREQ) += sa1100-cpufreq.o
77obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o 77obj-$(CONFIG_ARM_SA1110_CPUFREQ) += sa1110-cpufreq.o
78obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o 78obj-$(CONFIG_ARM_SPEAR_CPUFREQ) += spear-cpufreq.o
79obj-$(CONFIG_ARM_TEGRA_CPUFREQ) += tegra-cpufreq.o 79obj-$(CONFIG_ARM_TEGRA20_CPUFREQ) += tegra20-cpufreq.o
80obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o 80obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ) += vexpress-spc-cpufreq.o
81 81
82################################################################################## 82##################################################################################
diff --git a/drivers/cpufreq/tegra-cpufreq.c b/drivers/cpufreq/tegra20-cpufreq.c
index 8084c7f7e206..8084c7f7e206 100644
--- a/drivers/cpufreq/tegra-cpufreq.c
+++ b/drivers/cpufreq/tegra20-cpufreq.c