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 aa8c0a9..67d4ce7 100644 (file)
--- a/drivers/video/meson/meson_vpu.c
+++ b/drivers/video/meson/meson_vpu.c
@@ -11,8 +11,11 @@
 #include <dm.h>
 #include <efi_loader.h>
 #include <fdt_support.h>
+#include <log.h>
+#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>
 
@@ -41,7 +44,7 @@ bool meson_vpu_is_compatible(struct meson_vpu_priv *priv,
 
 static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp)
 {
-       struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev);
+       struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev);
        struct video_priv *uc_priv = dev_get_uclass_priv(dev);
        struct display_timing timing;
        bool is_cvbs = false;
@@ -136,7 +139,7 @@ static int meson_vpu_probe(struct udevice *dev)
 
 static int meson_vpu_bind(struct udevice *dev)
 {
-       struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
+       struct video_uc_plat *plat = dev_get_uclass_plat(dev);
 
        plat->size = VPU_MAX_WIDTH * VPU_MAX_HEIGHT *
                (1 << VPU_MAX_LOG2_BPP) / 8;
@@ -195,8 +198,8 @@ void meson_vpu_rsv_fb(void *fdt)
                return;
 
 #if defined(CONFIG_EFI_LOADER)
-       efi_add_memory_map(meson_fb.base, meson_fb.fb_size >> EFI_PAGE_SHIFT,
-                          EFI_RESERVED_MEMORY_TYPE, false);
+       efi_add_memory_map(meson_fb.base, meson_fb.fb_size,
+                          EFI_RESERVED_MEMORY_TYPE);
 #endif
 #if defined(CONFIG_VIDEO_DT_SIMPLEFB)
        meson_vpu_setup_simplefb(fdt);
@@ -209,6 +212,6 @@ U_BOOT_DRIVER(meson_vpu) = {
        .of_match = meson_vpu_ids,
        .probe = meson_vpu_probe,
        .bind = meson_vpu_bind,
-       .priv_auto_alloc_size = sizeof(struct meson_vpu_priv),
-       .flags  = DM_FLAG_PRE_RELOC | DM_FLAG_REMOVE_WITH_PD_ON,
+       .priv_auto      = sizeof(struct meson_vpu_priv),
+       .flags  = DM_FLAG_PRE_RELOC | DM_FLAG_LEAVE_PD_ON,
 };