On 09/27/2011 02:43 PM, Marek Vasut wrote:
> Signed-off-by: Marek Vasut <marek.va...@gmail.com>
> Cc: Stefano Babic <sba...@denx.de>
> ---
> board/ttcontrol/vision2/vision2.c | 6 ++++--
> drivers/video/mxc_ipuv3_fb.c | 9 +++++----
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
> V2: Configure the LCD via mx51_fb_init
You missed to send your patch to Anatolij (video maintainer), too.
>
> diff --git a/board/ttcontrol/vision2/vision2.c
> b/board/ttcontrol/vision2/vision2.c
> index ebca7b6..4565d1d 100644
> --- a/board/ttcontrol/vision2/vision2.c
> +++ b/board/ttcontrol/vision2/vision2.c
> @@ -39,11 +39,13 @@
> #include <mc13892.h>
> #include <linux/fb.h>
>
> +#include <../drivers/video/ipu.h>
> +
> DECLARE_GLOBAL_DATA_PTR;
>
> static u32 system_rev;
>
> -extern int mx51_fb_init(struct fb_videomode *mode);
> +extern int mx51_fb_init(struct fb_videomode *, uint8_t, uint32_t);
>
> static struct fb_videomode nec_nl6448bc26_09c = {
> "NEC_NL6448BC26-09C",
> @@ -646,7 +648,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);
> + ret = mx51_fb_init(&nec_nl6448bc26_09c, 0, IPU_PIX_FMT_RGB666);
> 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 a66981c..3fa8b8e 100644
> --- a/drivers/video/mxc_ipuv3_fb.c
> +++ b/drivers/video/mxc_ipuv3_fb.c
> @@ -526,7 +526,8 @@ static struct fb_info *mxcfb_init_fbinfo(void)
> *
> * @return Appropriate error code to the kernel common code
> */
> -static int mxcfb_probe(u32 interface_pix_fmt, struct fb_videomode *mode)
> +static int mxcfb_probe(u32 interface_pix_fmt, uint8_t disp,
> + struct fb_videomode *mode)
> {
> struct fb_info *fbi;
> struct mxcfb_info *mxcfbi;
> @@ -550,7 +551,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 = disp;
>
> ipu_disp_set_global_alpha(mxcfbi->ipu_ch, 1, 0x80);
> ipu_disp_set_color_key(mxcfbi->ipu_ch, 0, 0);
> @@ -625,7 +626,7 @@ void lcd_ctrl_init(void *lcdbase)
> memset(lcdbase, 0, mem_len);
> }
>
> -int mx51_fb_init(struct fb_videomode *mode)
> +int mx51_fb_init(struct fb_videomode *mode, uint8_t disp, uint32_t pixfmt)
> {
> int ret;
>
> @@ -636,7 +637,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(pixfmt, disp, mode);
>
> return ret;
> }
Agree with your changes- only they can conflict with the patch I
submitted recently to switch to CONFIG_VIDEO, see
http://patchwork.ozlabs.org/patch/116380/
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
