imx8: fdt: add optee node

Add OP-TEE device tree node for Linux according to args passed from ATF.
If ATF has been built with OP-TEE running, boot_pointer[1] will indicate
that.

Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c
index b2e7cf09cf4142a49df4f64ac2c1d7dcd1c2c9d8..65c8ac1a7e20b862af318ec1e2047bddcc59b3b7 100644 (file)
--- a/arch/arm/mach-imx/imx8/fdt.c
+++ b/arch/arm/mach-imx/imx8/fdt.c
@@ -226,6 +226,56 @@ static int config_smmu_fdt(void *blob)
        return 0;
 }
 
+static int ft_add_optee_node(void *fdt, bd_t *bd)
+{
+       const char *path, *subpath;
+       int offs;
+
+       /*
+        * No TEE space allocated indicating no TEE running, so no
+        * need to add optee node in dts
+        */
+       if (!boot_pointer[1])
+               return 0;
+
+       offs = fdt_increase_size(fdt, 512);
+       if (offs) {
+               printf("No Space for dtb\n");
+               return 1;
+       }
+
+       path = "/firmware";
+       offs = fdt_path_offset(fdt, path);
+       if (offs < 0) {
+               path = "/";
+               offs = fdt_path_offset(fdt, path);
+
+               if (offs < 0) {
+                       printf("Could not find root node.\n");
+                       return offs;
+               }
+
+               subpath = "firmware";
+               offs = fdt_add_subnode(fdt, offs, subpath);
+               if (offs < 0) {
+                       printf("Could not create %s node.\n", subpath);
+                       return offs;
+               }
+       }
+
+       subpath = "optee";
+       offs = fdt_add_subnode(fdt, offs, subpath);
+       if (offs < 0) {
+               printf("Could not create %s node.\n", subpath);
+               return offs;
+       }
+
+       fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz");
+       fdt_setprop_string(fdt, offs, "method", "smc");
+
+       return 0;
+}
+
 int ft_system_setup(void *blob, bd_t *bd)
 {
        int ret;
@@ -238,5 +288,5 @@ int ft_system_setup(void *blob, bd_t *bd)
                        return ret;
        }
 
-       return 0;
+       return ft_add_optee_node(blob, bd);
 }