From 326bd726d022f2be57ce9cd86f41130a0097beb6 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 22 Jun 2018 13:03:17 -0600 Subject: ARM: PSCI: Support PSCI v0.2 Enhance the PSCI DT editing code to allow setting a PSCI v0.2 compatible value in the DT. The CONFIG_ option is added to the whitelist to match the existing PSCI_1_0 option. While not adding new options to Kconfig isn't ideal, I figure it's better to keep related options together. Signed-off-by: Stephen Warren Signed-off-by: Tom Warren --- arch/arm/lib/psci-dt.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/lib') diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index 825fe1eefb..348df893b7 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -67,6 +67,8 @@ init_psci_node: psci_ver = sec_firmware_support_psci_version(); #elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI) psci_ver = ARM_PSCI_VER_1_0; +#elif defined(CONFIG_ARMV7_PSCI_0_2) + psci_ver = ARM_PSCI_VER_0_2; #endif if (psci_ver >= ARM_PSCI_VER_1_0) { tmp = fdt_setprop_string(fdt, nodeoff, -- cgit From 74c69cdcc01694b9c08194f2c0fc49f53e766810 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 22 Jun 2018 13:03:18 -0600 Subject: ARM: PSCI: Enable the PSCI node When fixing up the DT to report PSCI support, explicitly enable the node. DTs may ship with the node disabled in case a PSCI implementation is not present, and expect any PSCI implementation to enable the node if they are actually present. Signed-off-by: Stephen Warren Signed-off-by: Tom Warren --- arch/arm/lib/psci-dt.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'arch/arm/lib') diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c index 348df893b7..246f3c7cb8 100644 --- a/arch/arm/lib/psci-dt.c +++ b/arch/arm/lib/psci-dt.c @@ -116,6 +116,10 @@ init_psci_node: if (tmp) return tmp; + tmp = fdt_setprop_string(fdt, nodeoff, "status", "okay"); + if (tmp) + return tmp; + #endif return 0; } -- cgit