diff options
| author | Anatolij Gustschin <agust@denx.de> | 2020-05-26 09:38:17 +0200 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2020-06-18 19:38:50 +0200 |
| commit | fb3dd9c005045c2748e30d555d252c6985b97349 (patch) | |
| tree | 249daf008d2c816b3fca71b5a98e78f3b83f73e9 /drivers/video | |
| parent | 3715791e8a91934532d5e5a961c1b0eb36653685 (diff) | |
| download | u-boot-fb3dd9c005045c2748e30d555d252c6985b97349.zip u-boot-fb3dd9c005045c2748e30d555d252c6985b97349.tar.gz u-boot-fb3dd9c005045c2748e30d555d252c6985b97349.tar.bz2 | |
video: ipuv3: remove non-DM code
All ipuv3 users have been converted, drop obsolete code.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/imx/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/video/imx/mxc_ipuv3_fb.c | 43 |
2 files changed, 1 insertions, 44 deletions
diff --git a/drivers/video/imx/Kconfig b/drivers/video/imx/Kconfig index c33620e..78eb0f2 100644 --- a/drivers/video/imx/Kconfig +++ b/drivers/video/imx/Kconfig @@ -1,7 +1,7 @@ config VIDEO_IPUV3 bool "i.MX IPUv3 Core video support" - depends on (VIDEO || DM_VIDEO) && (MX5 || MX6) + depends on DM_VIDEO && (MX5 || MX6) help This enables framebuffer driver for i.MX processors working on the IPUv3(Image Processing Unit) internal graphic processor. diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 6787201..587d62f 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -38,10 +38,6 @@ DECLARE_GLOBAL_DATA_PTR; static int mxcfb_map_video_memory(struct fb_info *fbi); static int mxcfb_unmap_video_memory(struct fb_info *fbi); -#if !CONFIG_IS_ENABLED(DM_VIDEO) -/* graphics setup */ -static GraphicDevice panel; -#endif static struct fb_videomode const *gmode; static uint8_t gdisp; static uint32_t gpixfmt; @@ -391,12 +387,7 @@ static int mxcfb_map_video_memory(struct fb_info *fbi) } fbi->fix.smem_len = roundup(fbi->fix.smem_len, ARCH_DMA_MINALIGN); -#if CONFIG_IS_ENABLED(DM_VIDEO) fbi->screen_base = (char *)gd->video_bottom; -#else - fbi->screen_base = (char *)memalign(ARCH_DMA_MINALIGN, - fbi->fix.smem_len); -#endif fbi->fix.smem_start = (unsigned long)fbi->screen_base; if (fbi->screen_base == 0) { @@ -410,10 +401,7 @@ static int mxcfb_map_video_memory(struct fb_info *fbi) (uint32_t) fbi->fix.smem_start, fbi->fix.smem_len); fbi->screen_size = fbi->fix.smem_len; - -#if CONFIG_IS_ENABLED(VIDEO) gd->fb_base = fbi->fix.smem_start; -#endif /* Clear the screen */ memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); @@ -544,18 +532,6 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp, mxcfb_set_par(fbi); -#if !CONFIG_IS_ENABLED(DM_VIDEO) - panel.winSizeX = mode->xres; - panel.winSizeY = mode->yres; - panel.plnSizeX = mode->xres; - panel.plnSizeY = mode->yres; - - panel.frameAdrs = (u32)fbi->screen_base; - panel.memSize = fbi->screen_size; - - panel.gdfBytesPP = 2; - panel.gdfIndex = GDF_16BIT_565RGB; -#endif #ifdef DEBUG ipu_dump_registers(); #endif @@ -585,23 +561,6 @@ void ipuv3_fb_shutdown(void) } } -#if !CONFIG_IS_ENABLED(DM_VIDEO) -void *video_hw_init(void) -{ - int ret; - - ret = ipu_probe(); - if (ret) - puts("Error initializing IPU\n"); - - ret = mxcfb_probe(gpixfmt, gdisp, gmode); - debug("Framebuffer at 0x%x\n", (unsigned int)panel.frameAdrs); - gd->fb_base = panel.frameAdrs; - - return (void *)&panel; -} -#endif - int ipuv3_fb_init(struct fb_videomode const *mode, uint8_t disp, uint32_t pixfmt) @@ -613,7 +572,6 @@ int ipuv3_fb_init(struct fb_videomode const *mode, return 0; } -#if CONFIG_IS_ENABLED(DM_VIDEO) enum { /* Maximum display size we support */ LCD_MAX_WIDTH = 1920, @@ -711,4 +669,3 @@ U_BOOT_DRIVER(ipuv3_video) = { .priv_auto_alloc_size = sizeof(struct ipuv3_video_priv), .flags = DM_FLAG_PRE_RELOC, }; -#endif /* CONFIG_DM_VIDEO */ |