MA-19067 android: skip optee dtb node handling

Android doesn't use optee so skip optee dtb node
handling.

Change-Id: I30bf91a62fe774dbae0d219fd17405feed6f0784
Signed-off-by: Ji Luo <ji.luo@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 8aba071..d715ece 100644 (file)
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -1154,7 +1154,11 @@ usb_modify_speed:
                disable_cpu_nodes(blob, 2);
 #endif
 
+#if defined(CONFIG_ANDROID_SUPPORT) || defined(CONFIG_ANDROID_AUTO_SUPPORT)
+       return 0;
+#else
        return ft_add_optee_node(blob, bd);
+#endif
 }
 #endif