| commit | 57e84ca7c04f2a28ad2e5c4fa1722850860f2c7d | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Wed Sep 19 08:54:17 2012 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Sep 19 08:54:13 2012 -0700 |
| tree | 8b1c9767455c8a6d706a80b2fb7b3ee0c44520c0 | |
| parent | a402b2a10facdfa330180720ac0221144756e607 [diff] | |
| parent | 1163e8cff1acf958fcca102252425ca20caf1d1f [diff] |
Merge "msm: acpuclock-7627: Skip TCXO PLL for clk_enable"
diff --git a/arch/arm/mach-msm/acpuclock-7627.c b/arch/arm/mach-msm/acpuclock-7627.c index 5181761..1a2ae48 100644 --- a/arch/arm/mach-msm/acpuclock-7627.c +++ b/arch/arm/mach-msm/acpuclock-7627.c
@@ -739,7 +739,8 @@ } } - if (!(plls_enabled & (1 << tgt_s->pll))) { + if ((tgt_s->pll != ACPU_PLL_TCXO) && + !(plls_enabled & (1 << tgt_s->pll))) { rc = clk_enable(pll_clk[tgt_s->pll].clk); if (rc < 0) { pr_err("PLL%d enable failed (%d)\n",