aboutsummaryrefslogtreecommitdiff
path: root/plat/ti/k3
diff options
context:
space:
mode:
authorAlexei Fedorov <Alexei.Fedorov@arm.com>2020-01-30 16:55:55 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-01-30 16:55:55 +0000
commitf69a5828b74ca27bd3872de9c8c6c5a107915c49 (patch)
tree4b0d21b6ac7e97e2e90e56d28dc91b1e7202d366 /plat/ti/k3
parentb7e0ed2c7190616e4e0dae2ee8e8b0cc1ce718e5 (diff)
parentf1be00da0b0acf90355558e01d5f8e1f79c0d481 (diff)
downloadtrusted-firmware-a-f69a5828b74ca27bd3872de9c8c6c5a107915c49.tar.gz
Merge "Use correct type when reading SCR register" into integration
Diffstat (limited to 'plat/ti/k3')
-rw-r--r--plat/ti/k3/common/k3_psci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/ti/k3/common/k3_psci.c b/plat/ti/k3/common/k3_psci.c
index cf0a21d018..d6ed7667e9 100644
--- a/plat/ti/k3/common/k3_psci.c
+++ b/plat/ti/k3/common/k3_psci.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -25,7 +25,7 @@ uintptr_t k3_sec_entrypoint;
static void k3_cpu_standby(plat_local_state_t cpu_state)
{
- unsigned int scr;
+ u_register_t scr;
scr = read_scr_el3();
/* Enable the Non secure interrupt to wake the CPU */