diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-17 19:43:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-17 19:43:02 -0400 |
| commit | 6ec096a7116a5f1f7dfac5f69ef192429331905c (patch) | |
| tree | 7b10f20fe71a45687c0845e66c1942d90347b7bd /arch | |
| parent | 86fd291a7990af84e96808f48eff2219dd4ef496 (diff) | |
| parent | e648c4a3455a4d1880efe121602ed90a0bc9b53f (diff) | |
Merge tag 'u-boot-imx-master-20240317' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/19974
- Fix build error when SoM detection on Phytec board.
- Fix sc_misc_otp_fuse_read() error check on colibri-imx8x/apalis-imx8.
- Fix NPU/VPU fdt disable fixup on i.MX8M.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 39802d6a796..0c49fb9cd48 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@38300000", - "/soc@0/vpu@38300000" + "/soc@0/vpu@38300000", + "/soc@0/video-codec@38300000", + "/soc@0/video-codec@38310000", + "/soc@0/blk-ctrl@38320000", }; static const char * const nodes_path_8mm[] = { "/vpu_g1@38300000", "/vpu_g2@38310000", - "/vpu_h1@38320000" + "/vpu_h1@38320000", + "/soc@0/video-codec@38300000", + "/soc@0/video-codec@38310000", + "/soc@0/blk-ctrl@38330000", }; static const char * const nodes_path_8mp[] = { "/vpu_g1@38300000", "/vpu_g2@38310000", - "/vpu_vc8000e@38320000" + "/vpu_vc8000e@38320000", + "/soc@0/video-codec@38300000", + "/soc@0/video-codec@38310000", + "/soc@0/blk-ctrl@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@38500000" + "/vipsi@38500000", + "/soc@0/npu@38500000", }; return disable_fdt_nodes(blob, nodes_path_8mp, ARRAY_SIZE(nodes_path_8mp)); |