Signed-off-by: Marek Vasut marek.vasut@gmail.com Cc: Stefano Babic sbabic@denx.de --- drivers/video/mxc_ipuv3_fb.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index a66981c..c4443e8 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -42,6 +42,16 @@
DECLARE_GLOBAL_DATA_PTR;
+/* Use DISP #1 by default. */ +#ifndef CONFIG_VIDEO_MX5_OUTPUT +#define CONFIG_VIDEO_MX5_OUTPUT 0 +#endif + +/* Use RGB666 pixel format by default. */ +#ifndef CONFIG_VIDEO_MX5_PIXFMT +#define CONFIG_VIDEO_MX5_PIXFMT IPU_PIX_FMT_RGB666 +#endif + void *lcd_base; /* Start of framebuffer memory */ void *lcd_console_address; /* Start of console buffer */
@@ -550,7 +560,7 @@ static int mxcfb_probe(u32 interface_pix_fmt, struct fb_videomode *mode) mxcfbi->blank = FB_BLANK_POWERDOWN; }
- mxcfbi->ipu_di = 0; + mxcfbi->ipu_di = CONFIG_VIDEO_MX5_OUTPUT;
ipu_disp_set_global_alpha(mxcfbi->ipu_ch, 1, 0x80); ipu_disp_set_color_key(mxcfbi->ipu_ch, 0, 0); @@ -636,7 +646,7 @@ int mx51_fb_init(struct fb_videomode *mode) lcd_base += 56;
debug("Framebuffer at 0x%x\n", (unsigned int)lcd_base); - ret = mxcfb_probe(IPU_PIX_FMT_RGB666, mode); + ret = mxcfb_probe(CONFIG_VIDEO_MX5_PIXFMT, mode);
return ret; }