diff options
| author | Jimmy Rubin <jimmy.rubin@stericsson.com> | 2011-09-20 08:59:20 +0200 |
|---|---|---|
| committer | Rabin VINCENT <rabin.vincent@stericsson.com> | 2011-10-04 11:21:25 +0200 |
| commit | b189b2fc4be9c22d55168392ac9fde5a5b10d9ba (patch) | |
| tree | 61d3e53dfb788380e345b1bd96301322bbfddb2f | |
| parent | 24fa0d7bd177f2dc42fc20e4cc5452d6a0a0d2e4 (diff) | |
arm: ux500: Configure dsi clocks and regulators
Removes dsi clock, dsi lp clock and VANA regulator if MCDE_DISPLAY_DSI
is not set.
Adds return value for enable_dsi_pll.
ST-Ericsson ID: 343541
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I64ede6273b39b05b2a048c62e8752fe615461364
Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com>
[venkata.biswanath@stericsson.com: only moved prcmu changes to
new file. The rest are already applied]
Signed-off-by: Venkata Biswanath <venkata.biswanath@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31801
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32860
Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
| -rw-r--r-- | drivers/mfd/db5500-prcmu.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/db5500-prcmu.c b/drivers/mfd/db5500-prcmu.c index 8594f5d528c..aee5ac397f9 100644 --- a/drivers/mfd/db5500-prcmu.c +++ b/drivers/mfd/db5500-prcmu.c @@ -1445,6 +1445,7 @@ int prcmu_resetout(u8 resoutn, u8 state) int db5500_prcmu_enable_dsipll(void) { int i; + int ret = 0; /* Enable DSIPLL_RESETN resets */ writel(PRCMU_RESET_DSIPLL, _PRCMU_BASE + PRCM_APE_RESETN_CLR); @@ -1467,9 +1468,14 @@ int db5500_prcmu_enable_dsipll(void) break; udelay(100); } + + if ((readl(_PRCMU_BASE + PRCM_PLLDSI_LOCKP) & + PRCMU_PLLDSI_LOCKP_LOCKED) + != PRCMU_PLLDSI_LOCKP_LOCKED) + ret = -EIO; /* Release DSIPLL_RESETN */ writel(PRCMU_RESET_DSIPLL, _PRCMU_BASE + PRCM_APE_RESETN_SET); - return 0; + return ret; } int db5500_prcmu_disable_dsipll(void) |