aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2014-05-28 15:15:49 +0100
committerJon Medhurst <tixy@linaro.org>2015-03-16 12:00:35 +0000
commita7c49878f8f67999e4e8147f602dfd71014244f0 (patch)
tree33213c749f1fd7a4adacf6c6baa68749e34c4c54 /drivers
parent31027c244478bec914b26ac70700b2e750e17dfc (diff)
[HACK] cpufreq: arm_big_little: Fall back to getting clock from cpu device
The driver in LSK assumes a hard-coded name for cluster clock, as used by vexpress TC2. Modify this to allow also clocks to be obtained from the cpu device; as Juno requires and as seems more like the correct way. Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/arm_big_little.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
index e1a6ba66a7f5..61171d5d8726 100644
--- a/drivers/cpufreq/arm_big_little.c
+++ b/drivers/cpufreq/arm_big_little.c
@@ -343,7 +343,9 @@ static int _get_cluster_clk_and_freq_table(struct device *cpu_dev)
}
name[12] = cluster + '0';
- clk[cluster] = clk_get(cpu_dev, name);
+ clk[cluster] = clk_get_sys(name, NULL);
+ if (IS_ERR(clk[cluster]))
+ clk[cluster] = clk_get(cpu_dev, NULL);
if (!IS_ERR(clk[cluster])) {
dev_dbg(cpu_dev, "%s: clk: %p & freq table: %p, cluster: %d\n",
__func__, clk[cluster], freq_table[cluster],