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 <swarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
lime2-spi
Stephen Warren 7 years ago committed by Tom Warren
parent 3e3b2b4776
commit 326bd726d0
  1. 2
      arch/arm/lib/psci-dt.c
  2. 1
      scripts/config_whitelist.txt

@ -67,6 +67,8 @@ init_psci_node:
psci_ver = sec_firmware_support_psci_version(); psci_ver = sec_firmware_support_psci_version();
#elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI) #elif defined(CONFIG_ARMV7_PSCI_1_0) || defined(CONFIG_ARMV8_PSCI)
psci_ver = ARM_PSCI_VER_1_0; psci_ver = ARM_PSCI_VER_1_0;
#elif defined(CONFIG_ARMV7_PSCI_0_2)
psci_ver = ARM_PSCI_VER_0_2;
#endif #endif
if (psci_ver >= ARM_PSCI_VER_1_0) { if (psci_ver >= ARM_PSCI_VER_1_0) {
tmp = fdt_setprop_string(fdt, nodeoff, tmp = fdt_setprop_string(fdt, nodeoff,

@ -51,6 +51,7 @@ CONFIG_ARMADA100
CONFIG_ARMADA100_FEC CONFIG_ARMADA100_FEC
CONFIG_ARMADA168 CONFIG_ARMADA168
CONFIG_ARMADA_39X CONFIG_ARMADA_39X
CONFIG_ARMV7_PSCI_0_2
CONFIG_ARMV7_PSCI_1_0 CONFIG_ARMV7_PSCI_1_0
CONFIG_ARMV7_SECURE_BASE CONFIG_ARMV7_SECURE_BASE
CONFIG_ARMV7_SECURE_MAX_SIZE CONFIG_ARMV7_SECURE_MAX_SIZE

Loading…
Cancel
Save