Merge branch '2021-02-02-drop-asm_global_data-when-unused'

[platform/kernel/u-boot.git] / drivers / video / meson / meson_vpu.c

diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c
index ca6933a..67d4ce7 100644 (file)
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -15,6 +15,7 @@
 #include <part.h>
 #include <linux/sizes.h>
 #include <asm/arch/mem.h>
+#include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/uclass-internal.h>
 
@@ -212,5 +213,5 @@ U_BOOT_DRIVER(meson_vpu) = {
        .probe = meson_vpu_probe,
        .bind = meson_vpu_bind,
        .priv_auto      = sizeof(struct meson_vpu_priv),
-       .flags  = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON,
+       .flags  = DM_FLAG_PRE_RELOC | DM_FLAG_LEAVE_PD_ON,
 };