global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

[platform/kernel/u-boot.git] / arch / arm / lib / psci-dt.c

diff --git a/arch/arm/lib/psci-dt.c b/arch/arm/lib/psci-dt.c
index baf6d70..903b335 100644 (file)
--- a/arch/arm/lib/psci-dt.c
+++ b/arch/arm/lib/psci-dt.c
@@ -1,22 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016 NXP Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <libfdt.h>
+#include <asm/cache.h>
+#include <linux/libfdt.h>
 #include <fdt_support.h>
 #include <linux/sizes.h>
 #include <linux/kernel.h>
 #include <asm/psci.h>
-#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
 #include <asm/armv8/sec_firmware.h>
 #endif
 
 int fdt_psci(void *fdt)
 {
-#if defined(CONFIG_ARMV8_PSCI) || defined(CONFIG_ARMV7_PSCI)
+#if defined(CONFIG_ARMV7_PSCI) || defined(CONFIG_ARMV8_PSCI) || \
+       defined(CONFIG_SEC_FIRMWARE_ARMV8_PSCI)
        int nodeoff;
        unsigned int psci_ver = 0;
        int tmp;
@@ -63,27 +64,32 @@ int fdt_psci(void *fdt)
                return nodeoff;
 
 init_psci_node:
-#ifdef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+#if CONFIG_IS_ENABLED(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;
+#elif defined(CONFIG_ARMV7_PSCI_0_2)
+       psci_ver = ARM_PSCI_VER_0_2;
 #endif
-       switch (psci_ver) {
-       case ARM_PSCI_VER_1_0:
+       if (psci_ver >= ARM_PSCI_VER_1_0) {
                tmp = fdt_setprop_string(fdt, nodeoff,
                                "compatible", "arm,psci-1.0");
                if (tmp)
                        return tmp;
-       case ARM_PSCI_VER_0_2:
+       }
+
+       if (psci_ver >= ARM_PSCI_VER_0_2) {
                tmp = fdt_appendprop_string(fdt, nodeoff,
                                "compatible", "arm,psci-0.2");
                if (tmp)
                        return tmp;
-       default:
+       }
+
+#if !CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT)
        /*
         * The Secure firmware framework isn't able to support PSCI version 0.1.
         */
-#ifndef CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT
+       if (psci_ver < ARM_PSCI_VER_0_2) {
                tmp = fdt_appendprop_string(fdt, nodeoff,
                                "compatible", "arm,psci");
                if (tmp)
@@ -104,14 +110,17 @@ init_psci_node:
                                ARM_PSCI_FN_MIGRATE);
                if (tmp)
                        return tmp;
-#endif
-               break;
        }
+#endif
 
        tmp = fdt_setprop_string(fdt, nodeoff, "method", "smc");
        if (tmp)
                return tmp;
 
+       tmp = fdt_setprop_string(fdt, nodeoff, "status", "okay");
+       if (tmp)
+               return tmp;
+
 #endif
        return 0;
 }