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

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

[Vitor Soares]

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

With the introduction of downstream Linux 6.6, the iMX8MP VPU block
control node in DTS was renamed "blk-ctl@38330000" and will not match
the ones found in `node_path_imx8mp` resulting in the node not being
disabled on the VPU-less variants.

Add an extra node_path entry for imx8mp VPU block control that match
with downstream Linux.

Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
---
 arch/arm/mach-imx/imx8m/soc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index be38ca528850..4c224382021e 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -955,6 +955,7 @@ int disable_vpu_nodes(void *blob)
 		"/soc@0/video-codec@38300000",
 		"/soc@0/video-codec@38310000",
 		"/soc@0/blk-ctrl@38330000",
+		"/soc@0/blk-ctl@38330000",
 	};
 
 	if (is_imx8mq())
-- 
2.34.1

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

[Peng Fan]

> Subject: [PATCH v1] arm: imx: imx8m: soc: Fix VPU fdt disable fixup
> 
> From: Vitor Soares <vitor.soares@toradex.com>
> 
> With the introduction of downstream Linux 6.6, the iMX8MP VPU
> block control node in DTS was renamed "blk-ctl@38330000" and will
> not match the ones found in `node_path_imx8mp` resulting in the
> node not being disabled on the VPU-less variants.
> 
> Add an extra node_path entry for imx8mp VPU block control that
> match with downstream Linux.
> 
> Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
> ---

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

I am thinking to make ocotp as access controller, then we no need
such code in uboot in future.

Thanks,
Peng.

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

[Fabio Estevam]

On Tue, Oct 1, 2024 at 1:02 PM Vitor Soares <ivitro@gmail.com> wrote:
>
> From: Vitor Soares <vitor.soares@toradex.com>
>
> With the introduction of downstream Linux 6.6, the iMX8MP VPU block
> control node in DTS was renamed "blk-ctl@38330000" and will not match
> the ones found in `node_path_imx8mp` resulting in the node not being
> disabled on the VPU-less variants.
>
> Add an extra node_path entry for imx8mp VPU block control that match
> with downstream Linux.
>
> Signed-off-by: Vitor Soares <vitor.soares@toradex.com>

Applied to u-boot-imx/next, thanks.