[PATCH v1] arm: imx: imx8m: soc: Fix NPU/VPU fdt disable fixup

[Vitor Soares]

From: Vitor Soares <vitor.soares at toradex.com>

On imx8m[m|p|q].dtsi, upstream Linux uses different names for NPU/VPU
IP block nodes. It leads variants without such HW block having it
enabled by default.

This patch adds the upstream Linux node's paths to the disable list while
keep the compatibility with downstream Linux.

Signed-off-by: Vitor Soares <vitor.soares at toradex.com>
---
 arch/arm/mach-imx/imx8m/soc.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 39802d6a79..0c49fb9cd4 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -933,19 +933,28 @@ int disable_vpu_nodes(void *blob)
 {
 	static const char * const nodes_path_8mq[] = {
 		"/vpu at 38300000",
-		"/soc at 0/vpu at 38300000"
+		"/soc at 0/vpu at 38300000",
+		"/soc at 0/video-codec at 38300000",
+		"/soc at 0/video-codec at 38310000",
+		"/soc at 0/blk-ctrl at 38320000",
 	};
 
 	static const char * const nodes_path_8mm[] = {
 		"/vpu_g1 at 38300000",
 		"/vpu_g2 at 38310000",
-		"/vpu_h1 at 38320000"
+		"/vpu_h1 at 38320000",
+		"/soc at 0/video-codec at 38300000",
+		"/soc at 0/video-codec at 38310000",
+		"/soc at 0/blk-ctrl at 38330000",
 	};
 
 	static const char * const nodes_path_8mp[] = {
 		"/vpu_g1 at 38300000",
 		"/vpu_g2 at 38310000",
-		"/vpu_vc8000e at 38320000"
+		"/vpu_vc8000e at 38320000",
+		"/soc at 0/video-codec at 38300000",
+		"/soc at 0/video-codec at 38310000",
+		"/soc at 0/blk-ctrl at 38330000",
 	};
 
 	if (is_imx8mq())
@@ -1100,7 +1109,8 @@ int disable_gpu_nodes(void *blob)
 int disable_npu_nodes(void *blob)
 {
 	static const char * const nodes_path_8mp[] = {
-		"/vipsi at 38500000"
+		"/vipsi at 38500000",
+		"/soc at 0/npu at 38500000",
 	};
 
 	return disable_fdt_nodes(blob, nodes_path_8mp, ARRAY_SIZE(nodes_path_8mp));
-- 
2.34.1