Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / mach-stm32mp / fdt.c

diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index a3db86dc465f29751879bf166298f3b2ed4b2425..c723b223e08258ff46112ef933f55d032bbae7cf 100644 (file)
--- a/arch/arm/mach-stm32mp/fdt.c
+++ b/arch/arm/mach-stm32mp/fdt.c
@@ -5,6 +5,8 @@
 
 #include <common.h>
 #include <fdt_support.h>
+#include <log.h>
+#include <tee.h>
 #include <asm/arch/sys_proto.h>
 #include <dt-bindings/pinctrl/stm32-pinfunc.h>
 #include <linux/io.h>
@@ -218,6 +220,26 @@ static void stm32_fdt_disable(void *fdt, int offset, u32 addr,
                       string, addr, name);
 }
 
+static void stm32_fdt_disable_optee(void *blob)
+{
+       int off, node;
+
+       off = fdt_node_offset_by_compatible(blob, -1, "linaro,optee-tz");
+       if (off >= 0 && fdtdec_get_is_enabled(blob, off))
+               fdt_status_disabled(blob, off);
+
+       /* Disabled "optee@..." reserved-memory node */
+       off = fdt_path_offset(blob, "/reserved-memory/");
+       if (off < 0)
+               return;
+       for (node = fdt_first_subnode(blob, off);
+            node >= 0;
+            node = fdt_next_subnode(blob, node)) {
+               if (!strncmp(fdt_get_name(blob, node, NULL), "optee@", 6))
+                       fdt_status_disabled(blob, node);
+       }
+}
+
 /*
  * This function is called right before the kernel is booted. "blob" is the
  * device tree that will be passed to the kernel.
@@ -244,6 +266,8 @@ int ft_system_setup(void *blob, bd_t *bd)
        get_soc_name(name);
 
        switch (cpu) {
+       case CPU_STM32MP151Fxx:
+       case CPU_STM32MP151Dxx:
        case CPU_STM32MP151Cxx:
        case CPU_STM32MP151Axx:
                stm32_fdt_fixup_cpu(blob, name);
@@ -251,6 +275,8 @@ int ft_system_setup(void *blob, bd_t *bd)
                soc = fdt_path_offset(blob, "/soc");
                stm32_fdt_disable(blob, soc, STM32_FDCAN_BASE, "can", name);
                /* fall through */
+       case CPU_STM32MP153Fxx:
+       case CPU_STM32MP153Dxx:
        case CPU_STM32MP153Cxx:
        case CPU_STM32MP153Axx:
                stm32_fdt_disable(blob, soc, STM32_GPU_BASE, "gpu", name);
@@ -261,8 +287,11 @@ int ft_system_setup(void *blob, bd_t *bd)
        }
 
        switch (cpu) {
+       case CPU_STM32MP157Dxx:
        case CPU_STM32MP157Axx:
+       case CPU_STM32MP153Dxx:
        case CPU_STM32MP153Axx:
+       case CPU_STM32MP151Dxx:
        case CPU_STM32MP151Axx:
                stm32_fdt_disable(blob, soc, STM32_CRYP1_BASE, "cryp", name);
                stm32_fdt_disable(blob, soc, STM32_CRYP2_BASE, "cryp", name);
@@ -295,5 +324,9 @@ int ft_system_setup(void *blob, bd_t *bd)
                                       "st,package", pkg, false);
        }
 
+       if (!CONFIG_IS_ENABLED(OPTEE) ||
+           !tee_find_device(NULL, NULL, NULL, NULL))
+               stm32_fdt_disable_optee(blob);
+
        return ret;
 }