diff options
| author | Rickard Andersson <rickard.andersson@stericsson.com> | 2011-06-15 15:50:23 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-12-06 11:00:43 +0100 |
| commit | 3b1319c0a4d5b864cd3876fa8ef63c70345d1dc7 (patch) | |
| tree | afda2c466a602a3b35286310c3fbbbc495c04104 /drivers/staging | |
| parent | 173efb5d235bc7f6b84da6a63c04fc0199da69da (diff) | |
drivers:nmf-cm: Correct handling of CR register
This patch changes to using read-modify-write
sequence when modifying content in the CR register
in peripheral block 6.
Without this patch secure world can hang during
suspend/resume deep sleep with ESRAM0 turned
off. This happend because important settings
in CR register was lost.
ST-Ericsson Linux next: -
ST-Ericsson ID: ER345629
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I524e8ed307bca5645aecbcebf26317474234490b
Signed-off-by: Rickard Andersson <rickard.andersson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25174
Reviewed-by: Pierre PEIFFER <pierre.peiffer@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/nmf-cm/cmld.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/nmf-cm/cmld.c b/drivers/staging/nmf-cm/cmld.c index 9a7183c14fc..5b26762677d 100644 --- a/drivers/staging/nmf-cm/cmld.c +++ b/drivers/staging/nmf-cm/cmld.c @@ -1060,7 +1060,7 @@ static int __init cmld_init_module(void) /* Activate SVA 90 KHz timer */ if (htim_base == NULL) goto out; - iowrite32((1<<26), htim_base); + iowrite32((1<<26) | ioread32(htim_base), htim_base); iounmap(htim_base); /*i = ioread32(PRCM_SVAMMDSPCLK_MGT) & 0xFF; |