DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: footswitch-8x60: Update collapse steps for memory retention robustness" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2011-12-08 14:54:13 -08:00
committed by QuIC Gerrit Code Review
parent 5ba1e3291c 1ab7d94be8
commit fbf1453902
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-msm/footswitch-8x60.c
View File

@@ -255,6 +255,14 @@ static int footswitch_disable(struct regulator_dev *rdev)
/* Wait for synchronous resets to propagate. */
udelay(RESET_DELAY_US);
/*
* Return clocks to their state before this function. For robustness
* if memory-retention across collapses is required, clocks should
* be disabled before asserting the clamps. Assuming clocks were off
* before entering footswitch_disable(), this will be true.
*/
restore_clocks(fs);
/*
* Clamp the I/O ports of the core to ensure the values
* remain fixed while the core is collapsed.
@@ -266,9 +274,6 @@ static int footswitch_disable(struct regulator_dev *rdev)
regval &= ~ENABLE_BIT;
writel_relaxed(regval, fs->gfs_ctl_reg);
/* Return clocks to their state before this function. */
restore_clocks(fs);
fs->is_enabled = false;
return rc;