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

Merge "clk: qcom: osm: Initialize ACD when the cluster is online"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-22 07:40:26 -07:00 • committed by Gerrit - the friendly Code Review server
commit d519bfb9c1
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/clk/qcom/clk-cpu-osm.c
View file

@ -719,9 +719,22 @@ static int clk_osm_set_rate(struct clk_hw *hw, unsigned long rate,
return 0;
}
static int clk_osm_acd_init(struct clk_osm *c);
static int clk_osm_enable(struct clk_hw *hw)
{
struct clk_osm *cpuclk = to_clk_osm(hw);
int rc;
rc = clk_osm_acd_init(cpuclk);
if (rc) {
pr_err("Failed to initialize ACD for cluster %d, rc=%d\n",
cpuclk->cluster_num, rc);
return rc;
}
/* Wait for 5 usecs before enabling OSM */
udelay(5);
clk_osm_write_reg(cpuclk, 1, ENABLE_REG);
@ -3272,17 +3285,6 @@ static int clk_cpu_osm_driver_probe(struct platform_device *pdev)
clk_osm_setup_cluster_pll(&perfcl_clk);
}
rc = clk_osm_acd_init(&pwrcl_clk);
if (rc) {
pr_err("failed to initialize ACD for pwrcl, rc=%d\n", rc);
return rc;
}
rc = clk_osm_acd_init(&perfcl_clk);
if (rc) {
pr_err("failed to initialize ACD for perfcl, rc=%d\n", rc);
return rc;
}
spin_lock_init(&pwrcl_clk.lock);
spin_lock_init(&perfcl_clk.lock);