aboutsummaryrefslogtreecommitdiff
path: root/plat/socionext
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/socionext
parentb7e0ed2c7190616e4e0dae2ee8e8b0cc1ce718e5 (diff)
parentf1be00da0b0acf90355558e01d5f8e1f79c0d481 (diff)
downloadtrusted-firmware-a-f69a5828b74ca27bd3872de9c8c6c5a107915c49.tar.gz
Merge "Use correct type when reading SCR register" into integration
Diffstat (limited to 'plat/socionext')
-rw-r--r--plat/socionext/synquacer/sq_psci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/socionext/synquacer/sq_psci.c b/plat/socionext/synquacer/sq_psci.c
index 731b19a323..0c97fcf79f 100644
--- a/plat/socionext/synquacer/sq_psci.c
+++ b/plat/socionext/synquacer/sq_psci.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -155,7 +155,7 @@ void __dead2 sq_system_reset(void)
void sq_cpu_standby(plat_local_state_t cpu_state)
{
- unsigned int scr;
+ u_register_t scr;
assert(cpu_state == SQ_LOCAL_STATE_RET);