diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-07-08 16:49:17 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-07-08 16:49:17 +0100 |
| commit | ffda35a49067dad42d5b7344a2b55639dbb7f422 (patch) | |
| tree | fb447a24b2c6bb4ac84e6ce113740111a655aa4a | |
| parent | 45aa25b33d9d4ac1056c3614e790356395fef039 (diff) | |
| parent | 7af31f471b1b2dc664445611889b990a4634a5c9 (diff) | |
Merge branch 'lsk-3.10-armlt-scpi-cpufreq' into integration-lsk-3.10-juno-androidlsk-3.10-armlt-juno-20150708
This just adds a fix for TC2, commit 7af31f471b1b2dc
("cpufreq: arm_big_little: Fallback to getting cpu clocks by name")
| -rw-r--r-- | drivers/cpufreq/arm_big_little.c | 5 |
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], |