Merge branch 'cpufreq-fixes' of git://git.linaro.org/people/vireshk/linux into pm...

Pull ARM cpufreq fixes from Viresh Kumar.

* 'cpufreq-fixes' of git://git.linaro.org/people/vireshk/linux:
  cpufreq: fix EXYNOS drivers selection
  cpufreq: exynos5440: Fix to skip when new frequency same as current

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index de4d5d93c3fdc826ae013c6f7e0652b13e550f2d..0fa204b244bd2df52974a50fc4290e9fa77d287c 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -17,37 +17,47 @@ config ARM_DT_BL_CPUFREQ
          big.LITTLE platform. This gets frequency tables from DT.
 
 config ARM_EXYNOS_CPUFREQ
-       bool "SAMSUNG EXYNOS SoCs"
-       depends on ARCH_EXYNOS
+       bool
        select CPU_FREQ_TABLE
-       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
+       bool "SAMSUNG EXYNOS4210"
+       depends on CPU_EXYNOS4210
+       default y
+       select ARM_EXYNOS_CPUFREQ
        help
          This adds the CPUFreq driver for Samsung EXYNOS4210
          SoC (S5PV310 or S5PC210).
 
+         If in doubt, say N.
+
 config ARM_EXYNOS4X12_CPUFREQ
-       def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
+       bool "SAMSUNG EXYNOS4x12"
+       depends on (SOC_EXYNOS4212 || SOC_EXYNOS4412)
+       default y
+       select ARM_EXYNOS_CPUFREQ
        help
          This adds the CPUFreq driver for Samsung EXYNOS4X12
          SoC (EXYNOS4212 or EXYNOS4412).
 
+         If in doubt, say N.
+
 config ARM_EXYNOS5250_CPUFREQ
-       def_bool SOC_EXYNOS5250
+       bool "SAMSUNG EXYNOS5250"
+       depends on SOC_EXYNOS5250
+       default y
+       select ARM_EXYNOS_CPUFREQ
        help
          This adds the CPUFreq driver for Samsung EXYNOS5250
          SoC.
 
+         If in doubt, say N.
+
 config ARM_EXYNOS5440_CPUFREQ
-       def_bool SOC_EXYNOS5440
+       bool "SAMSUNG EXYNOS5440"
+       depends on SOC_EXYNOS5440
        depends on HAVE_CLK && PM_OPP && OF
+       default y
        select CPU_FREQ_TABLE
        help
          This adds the CPUFreq driver for Samsung EXYNOS5440
@@ -55,6 +65,8 @@ config ARM_EXYNOS5440_CPUFREQ
          different than previous exynos controllers so not using
          the common exynos framework.
 
+         If in doubt, say N.
+
 config ARM_HIGHBANK_CPUFREQ
        tristate "Calxeda Highbank-based"
        depends on ARCH_HIGHBANK

diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 366475161c76aa86e320b881fd9d775d638b0065..0fac34439e3171dbc97b8f717a935b691657cba9 100644 (file)
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -332,7 +332,6 @@ err_cpufreq:
        regulator_put(arm_regulator);
 err_vdd_arm:
        kfree(exynos_info);
-       pr_debug("%s: failed initialization\n", __func__);
        return -EINVAL;
 }
 late_initcall(exynos_cpufreq_init);

diff --git a/drivers/cpufreq/exynos-cpufreq.h b/drivers/cpufreq/exynos-cpufreq.h
index 92b852ee5ddcca037bcbf9d2376ff3a4cb3a62c2..7f25cee8cec275692ee685a8b9bbccaf501b6a09 100644 (file)
--- a/drivers/cpufreq/exynos-cpufreq.h
+++ b/drivers/cpufreq/exynos-cpufreq.h
@@ -43,6 +43,27 @@ struct exynos_dvfs_info {
        bool (*need_apll_change)(unsigned int, unsigned int);
 };
 
+#ifdef CONFIG_ARM_EXYNOS4210_CPUFREQ
 extern int exynos4210_cpufreq_init(struct exynos_dvfs_info *);
+#else
+static inline int exynos4210_cpufreq_init(struct exynos_dvfs_info *info)
+{
+       return -EOPNOTSUPP;
+}
+#endif
+#ifdef CONFIG_ARM_EXYNOS4X12_CPUFREQ
 extern int exynos4x12_cpufreq_init(struct exynos_dvfs_info *);
+#else
+static inline int exynos4x12_cpufreq_init(struct exynos_dvfs_info *info)
+{
+       return -EOPNOTSUPP;
+}
+#endif
+#ifdef CONFIG_ARM_EXYNOS5250_CPUFREQ
 extern int exynos5250_cpufreq_init(struct exynos_dvfs_info *);
+#else
+static inline int exynos5250_cpufreq_init(struct exynos_dvfs_info *info)
+{
+       return -EOPNOTSUPP;
+}
+#endif

diff --git a/drivers/cpufreq/exynos5440-cpufreq.c b/drivers/cpufreq/exynos5440-cpufreq.c
index 0c74018eda47e1fd2d09ef0db1baaf8595a70547..d514c152fd1a43041e8ff570fca7f9cc2b28f58d 100644 (file)
--- a/drivers/cpufreq/exynos5440-cpufreq.c
+++ b/drivers/cpufreq/exynos5440-cpufreq.c
@@ -238,6 +238,9 @@ static int exynos_target(struct cpufreq_policy *policy,
        freqs.old = dvfs_info->cur_frequency;
        freqs.new = freq_table[index].frequency;
 
+       if (freqs.old == freqs.new)
+               goto out;
+
        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
        /* Set the target frequency in all C0_3_PSTATE register */