aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2015-07-08 15:54:53 +0100
committerJon Medhurst <tixy@linaro.org>2015-07-08 16:48:48 +0100
commit7af31f471b1b2dc664445611889b990a4634a5c9 (patch)
treeedbfa9096644d2a5f365c7a4707201882e67f673
parentd5fc011a16fe1f838f68d6f6f20cbbf4581c8c29 (diff)
cpufreq: arm_big_little: Fallback to getting cpu clocks by namelsk-3.10-armlt-scpi-cpufreq
Early versions of the big.LITTLE driver used special names for cpu clocks and vexpress TC2 code expects this, so provide a fallback path to allow this to continue to work. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--drivers/cpufreq/arm_big_little.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
index 99a12ac4d3fb..b95b27f76db0 100644
--- a/drivers/cpufreq/arm_big_little.c
+++ b/drivers/cpufreq/arm_big_little.c
@@ -352,6 +352,11 @@ static int _get_cluster_clk_and_freq_table(struct device *cpu_dev)
}
clk[cluster] = clk_get(cpu_dev, NULL);
+ if (IS_ERR(clk[cluster])) {
+ char name[14] = "cpu-cluster.X";
+ name[12] = cluster + '0';
+ clk[cluster] = clk_get_sys(name, 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],