Merge branch 'next/cpufreq-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 'next/cpufreq-exynos' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  cpufreq: exynos: Fix hang in pm handler due to frequency mismatch
  cpufreq: exynos: Initialize return variable
  cpufreq: exynos: Fix unsigned variable being checked for negative value
  cpufreq: exynos: Get booting freq value in exynos_cpufreq_init
  cpufreq: exynos: Show list of available frequencies
  cpufreq: exynos: Add missing static
  cpufreq: exynos: Split exynos_target function into two functions
  cpufreq: exynos: Use APLL_FREQ macro for cpu divider value
  cpufreq: exynos: Check old & new frequency early
  cpufreq: exynos: Remove unused variable & IS_ERR

1 files changed, 16 insertions, 3 deletions

diff --git a/arch/arm/mach-exynos/include/mach/cpufreq.h b/arch/arm/mach-exynos/include/mach/cpufreq.h
index 7517c3f417af..b5d39dd03b2a 100644
--- a/arch/arm/mach-exynos/include/mach/cpufreq.h
+++ b/arch/arm/mach-exynos/include/mach/cpufreq.h
@@ -18,12 +18,25 @@ enum cpufreq_level_index {
         L20,
 };
 
+#define APLL_FREQ(f, a0, a1, a2, a3, a4, a5, a6, a7, b0, b1, b2, m, p, s) \
+        { \
+                .freq = (f) * 1000, \
+                .clk_div_cpu0 = ((a0) | (a1) << 4 | (a2) << 8 | (a3) << 12 | \
+                        (a4) << 16 | (a5) << 20 | (a6) << 24 | (a7) << 28), \
+                .clk_div_cpu1 = (b0 << 0 | b1 << 4 | b2 << 8), \
+                .mps = ((m) << 16 | (p) << 8 | (s)), \
+        }
+
+struct apll_freq {
+        unsigned int freq;
+        u32 clk_div_cpu0;
+        u32 clk_div_cpu1;
+        u32 mps;
+};
+
 struct exynos_dvfs_info {
         unsigned long   mpll_freq_khz;
         unsigned int    pll_safe_idx;
-        unsigned int    pm_lock_idx;
-        unsigned int    max_support_idx;
-        unsigned int    min_support_idx;
         struct clk      *cpu_clk;
         unsigned int    *volt_table;
         struct cpufreq_frequency_table  *freq_table;