summaryrefslogtreecommitdiff
path: root/arch/arm/lib/psci-dt.c
diff options
context:
space:
mode:
authormacro.wave.z@gmail.com <macro.wave.z@gmail.com>2016-12-08 03:58:25 (GMT)
committerYork Sun <york.sun@nxp.com>2016-12-15 19:57:51 (GMT)
commit9a561753ce48def18dbc4aa278c685c93ed0a77d (patch)
treec8cae792414c13a82a40be1d7ad9d42cec433bd8 /arch/arm/lib/psci-dt.c
parent14bf25d50d934e95ffd7fc1276f9ab1e6c67bfbb (diff)
downloadu-boot-9a561753ce48def18dbc4aa278c685c93ed0a77d.tar.xz
ARMv8: Setup PSCI memory and device tree
Newly add ARMv8 PSCI needs to be initialized, be copied or reserved in right place, this patch does all the setup steps. Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com> Reviewed-by: Tom Rini <trini@konsulko.com> Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/arm/lib/psci-dt.c')
-rw-r--r--arch/arm/lib/psci-dt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index 41e139e..45af037 100644
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -16,7 +16,8 @@
int fdt_psci(void *fdt)
{
-#if defined(CONFIG_FSL_PPA_ARMV8_PSCI) || defined(CONFIG_ARMV7_PSCI)
+#if defined(CONFIG_ARMV7_PSCI) || defined(CONFIG_ARMV8_PSCI) || \
+ defined(CONFIG_FSL_PPA_ARMV8_PSCI)
int nodeoff;
unsigned int psci_ver = 0;
int tmp;
@@ -65,7 +66,7 @@ int fdt_psci(void *fdt)
init_psci_node:
#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
psci_ver = sec_firmware_support_psci_version();
-#elif defined(CONFIG_ARMV7_PSCI_1_0)
+#elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI)
psci_ver = ARM_PSCI_VER_1_0;
#endif
switch (psci_ver) {