summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/imx8m/soc.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-10-05 11:18:16 -0600
committerTom Rini <trini@konsulko.com>2024-10-05 11:18:16 -0600
commit7321b7dd36b3722fdbe2c661c8c478c429cd5267 (patch)
tree14eb3498aed79b317c97f5c19fc12102765b4246 /arch/arm/mach-imx/imx8m/soc.c
parentbe99d3cba64afda8b963b98682fa6e158e713c05 (diff)
parentef815d75514da91dd98f9e3278d810439fd1f1ea (diff)
Merge tag 'u-boot-imx-next-20241005' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx into next
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/22526 - Add DA9063 watchdog support for the imx6q-lxr2 board. - Add support for DH electronics i.MX8M Plus DHCOM PicoITX - Add DH i.MX8MP DHCOM SoM on DRC02 carrier board - Several fsl_esdhc_imx improvements. - Pas no-mmc-hs400 to mmc2 on imx8mm-cl-iot-gate.
Diffstat (limited to 'arch/arm/mach-imx/imx8m/soc.c')
-rw-r--r--arch/arm/mach-imx/imx8m/soc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c
index 46974bf0618..5293cb85e56 100644
--- a/arch/arm/mach-imx/imx8m/soc.c
+++ b/arch/arm/mach-imx/imx8m/soc.c
@@ -1004,6 +1004,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())