evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cpufreq: changes to adapt for opensource clock framework"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-13 08:07:52 -08:00 • committed by Gerrit - the friendly Code Review server
commit de9fa8b77a
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/arm/boot/dts/qcom/sdm660.dtsi
View file

@ -1177,16 +1177,8 @@
msm_cpufreq: qcom,msm-cpufreq { msm_cpufreq: qcom,msm-cpufreq {
compatible = "qcom,msm-cpufreq"; compatible = "qcom,msm-cpufreq";
clock-names = "cpu0_clk", "cpu1_clk", "cpu2_clk", clock-names = "cpu0_clk", "cpu4_clk";
"cpu3_clk", "cpu4_clk", "cpu5_clk",
"cpu6_clk", "cpu7_clk";
clocks = <&clock_cpu PWRCL_CLK>, clocks = <&clock_cpu PWRCL_CLK>,
<&clock_cpu PWRCL_CLK>,
<&clock_cpu PWRCL_CLK>,
<&clock_cpu PWRCL_CLK>,
<&clock_cpu PERFCL_CLK>,
<&clock_cpu PERFCL_CLK>,
<&clock_cpu PERFCL_CLK>,
<&clock_cpu PERFCL_CLK>; <&clock_cpu PERFCL_CLK>;
qcom,governor-per-policy; qcom,governor-per-policy;

6
drivers/cpufreq/qcom-cpufreq.c
View file

@ -3,7 +3,7 @@
* MSM architecture cpufreq driver * MSM architecture cpufreq driver
* *
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2007-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2007-2017, The Linux Foundation. All rights reserved.
* Author: Mike A. Chan <mikechan@google.com> * Author: Mike A. Chan <mikechan@google.com>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
@ -390,8 +390,10 @@ static int __init msm_cpufreq_probe(struct platform_device *pdev)
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
snprintf(clk_name, sizeof(clk_name), "cpu%d_clk", cpu); snprintf(clk_name, sizeof(clk_name), "cpu%d_clk", cpu);
c = devm_clk_get(dev, clk_name); c = devm_clk_get(dev, clk_name);
if (IS_ERR(c)) if (cpu == 0 && IS_ERR(c))
return PTR_ERR(c); return PTR_ERR(c);
else if (IS_ERR(c))
c = cpu_clk[cpu-1];
cpu_clk[cpu] = c; cpu_clk[cpu] = c;
} }
hotplug_ready = true; hotplug_ready = true;