public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] MX5: Make IPU display output and pixel format configurable
Date: Tue, 27 Sep 2011 14:09:25 +0200	[thread overview]
Message-ID: <1317125366-16059-1-git-send-email-marek.vasut@gmail.com> (raw)

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;
 }
-- 
1.7.5.4

             reply	other threads:[~2011-09-27 12:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-27 12:09 Marek Vasut [this message]
2011-09-27 12:22 ` [U-Boot] [PATCH] MX5: Make IPU display output and pixel format configurable Fabio Estevam
2011-09-27 12:31   ` Marek Vasut
2011-09-27 12:28 ` Stefano Babic
2011-09-27 12:43 ` [U-Boot] [PATCH V2] " Marek Vasut
2011-09-27 12:50   ` Stefano Babic
2011-09-27 12:58     ` Marek Vasut
2011-09-27 13:07       ` Stefano Babic
2011-09-27 13:19         ` Marek Vasut
2011-10-06 21:20   ` Wolfgang Denk
2011-10-06 21:32     ` Anatolij Gustschin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317125366-16059-1-git-send-email-marek.vasut@gmail.com \
    --to=marek.vasut@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox