From d5cb0240760190c4183ccc1d14104cbdcd5f857f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Thu, 16 Aug 2012 15:52:45 +0200 Subject: [PATCH] Rename mx51_fb_init() to mx5_fb_init() and add parameter 'bpp' --- board/ttcontrol/vision2/vision2.c | 2 +- drivers/video/mxc_ipuv3_fb.c | 5 +++-- include/ipu_pixfmt.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c index 282de95e95..d1bf9d680b 100644 --- a/board/ttcontrol/vision2/vision2.c +++ b/board/ttcontrol/vision2/vision2.c @@ -604,7 +604,7 @@ void lcd_enable(void) gpio_set_value(2, 1); mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT0); - ret = mx51_fb_init(&nec_nl6448bc26_09c, 0, IPU_PIX_FMT_RGB666); + ret = mx5_fb_init(&nec_nl6448bc26_09c, 0, IPU_PIX_FMT_RGB666, 16); if (ret) puts("LCD cannot be configured\n"); } diff --git a/drivers/video/mxc_ipuv3_fb.c b/drivers/video/mxc_ipuv3_fb.c index 1bee54c1a1..03d08670ca 100644 --- a/drivers/video/mxc_ipuv3_fb.c +++ b/drivers/video/mxc_ipuv3_fb.c @@ -540,7 +540,7 @@ static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp, mxcfbi->ipu_di_pix_fmt = interface_pix_fmt; fb_videomode_to_var(&fbi->var, mode); - fbi->var.bits_per_pixel = 16; + fbi->var.bits_per_pixel = default_bpp; fbi->fix.line_length = fbi->var.xres * (fbi->var.bits_per_pixel / 8); fbi->fix.smem_len = fbi->var.yres_virtual * fbi->fix.line_length; @@ -599,11 +599,12 @@ void video_set_lut(unsigned int index, /* color number */ return; } -int mx51_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt) +int mx5_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt, int bpp) { gmode = mode; gdisp = disp; gpixfmt = pixfmt; + default_bpp = bpp; return 0; } diff --git a/include/ipu_pixfmt.h b/include/ipu_pixfmt.h index 656f605462..5ffc98d861 100644 --- a/include/ipu_pixfmt.h +++ b/include/ipu_pixfmt.h @@ -76,6 +76,6 @@ #define IPU_PIX_FMT_YVU422P fourcc('Y', 'V', '1', '6') /*< 16 YVU 4:2:2 */ #define IPU_PIX_FMT_YUV422P fourcc('4', '2', '2', 'P') /*< 16 YUV 4:2:2 */ -int mx51_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt); +int mx5_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt, int bpp); #endif -- 2.39.2