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

Merge "clk: msm: clock-osm: Fix check to write to the LLM OVERRIDE register"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-05 19:29:22 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5a534a3946
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/clk/msm/clock-osm.c
View file

@ -460,7 +460,7 @@ static int clk_osm_set_rate(struct clk *c, unsigned long rate)
} }
pr_debug("rate: %lu --> index %d\n", rate, index); pr_debug("rate: %lu --> index %d\n", rate, index);
if (cpuclk->llm_sw_overr) { if (cpuclk->llm_sw_overr[0]) {
clk_osm_write_reg(cpuclk, cpuclk->llm_sw_overr[0], clk_osm_write_reg(cpuclk, cpuclk->llm_sw_overr[0],
LLM_SW_OVERRIDE_REG); LLM_SW_OVERRIDE_REG);
clk_osm_write_reg(cpuclk, cpuclk->llm_sw_overr[1], clk_osm_write_reg(cpuclk, cpuclk->llm_sw_overr[1],
@ -471,7 +471,7 @@ static int clk_osm_set_rate(struct clk *c, unsigned long rate)
/* Choose index and send request to OSM hardware */ /* Choose index and send request to OSM hardware */
clk_osm_write_reg(cpuclk, index, DCVS_PERF_STATE_DESIRED_REG); clk_osm_write_reg(cpuclk, index, DCVS_PERF_STATE_DESIRED_REG);
if (cpuclk->llm_sw_overr) { if (cpuclk->llm_sw_overr[0]) {
udelay(1); udelay(1);
clk_osm_write_reg(cpuclk, cpuclk->llm_sw_overr[2], clk_osm_write_reg(cpuclk, cpuclk->llm_sw_overr[2],
LLM_SW_OVERRIDE_REG); LLM_SW_OVERRIDE_REG);