cpufreq: ARM big LITTLE: Fixup for new SPC driver

Signed-off-by: Jon Medhurst <tixy@linaro.org>

diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 203e8959bde490d57eddce72fb5b41b14c441f5d..8327444b76cb58abaa0d22e9f6c3bf192f66fda0 100644 (file)
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -18,7 +18,7 @@ config ARM_DT_BL_CPUFREQ
 config ARM_VEXPRESS_BL_CPUFREQ
        tristate "ARM Vexpress big LITTLE CPUfreq driver"
        select ARM_BIG_LITTLE_CPUFREQ
-       depends on ARM_SPC
+       depends on VEXPRESS_SPC
        help
          This enables the CPUfreq driver for ARM Vexpress big.LITTLE platform.
          If in doubt, say N.

diff --git a/drivers/cpufreq/vexpress_big_little.c b/drivers/cpufreq/vexpress_big_little.c
index aac246207048f0ec16d2bec3a6faba1e7e8aacd0..1abb883c051b64fb8cd2af721908eaa9710deb05 100644 (file)
--- a/drivers/cpufreq/vexpress_big_little.c
+++ b/drivers/cpufreq/vexpress_big_little.c
@@ -30,9 +30,10 @@
 static int vexpress_init_opp_table(struct device *cpu_dev)
 {
        int i = -1, count, cluster = cpu_to_cluster(cpu_dev->id);
-       unsigned int *table = vexpress_spc_get_freq_table(cluster, &count);
+       u32 *table;
        int ret;
 
+       count = vexpress_spc_get_freq_table(cluster, &table);
        if (!table || !count) {
                pr_err("SPC controller returned invalid freq table");
                return -EINVAL;