summaryrefslogtreecommitdiff
path: root/core/arch/arm/plat-imx/a9_plat_init.S
diff options
context:
space:
mode:
authorr.tyminski <r.tyminski@partner.samsung.com>2017-06-05 12:44:25 +0200
committerr.tyminski <r.tyminski@partner.samsung.com>2017-06-05 12:44:25 +0200
commit146aec115cd05a164a88e6d7b07435c57a33817f (patch)
treed8099075c92576b1928069af274f9b833aca996e /core/arch/arm/plat-imx/a9_plat_init.S
parentf9a43781767007462965b21f3f518c4cfc0744c7 (diff)
downloadtef-optee_os-146aec115cd05a164a88e6d7b07435c57a33817f.tar.gz
tef-optee_os-146aec115cd05a164a88e6d7b07435c57a33817f.tar.bz2
tef-optee_os-146aec115cd05a164a88e6d7b07435c57a33817f.zip
Update from upstream to 2.4.0 versionupstream/2.4.0upstream
Change-Id: I2b3a30f20684d6629fe379d9cd7895aff759c301
Diffstat (limited to 'core/arch/arm/plat-imx/a9_plat_init.S')
-rw-r--r--core/arch/arm/plat-imx/a9_plat_init.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/arch/arm/plat-imx/a9_plat_init.S b/core/arch/arm/plat-imx/a9_plat_init.S
index 64d03f5..db13018 100644
--- a/core/arch/arm/plat-imx/a9_plat_init.S
+++ b/core/arch/arm/plat-imx/a9_plat_init.S
@@ -85,7 +85,7 @@ UNWIND( .fnstart)
* - NSec cannot access PLE (PLE bit16=0)
* - NSec can use SIMD/VFP (CP10/CP11) (bit15:14=2b00, bit11:10=2b11)
*
- * PCR = 0x00000001
+ * PCR
* - no change latency, enable clk gating
*/
movw r0, #0x4000
@@ -100,8 +100,8 @@ UNWIND( .fnstart)
movt r0, #0x0002
write_nsacr r0
- movw r0, #0x0000
- movt r0, #0x0001
+ read_pcr r0
+ orr r0, r0, #0x1
write_pcr r0
mov pc, lr