commit f497d0153a6b53b4cfd004de5f10b14bf630d852
author Sascha Hauer <s.hauer@pengutronix.de> Wed Mar 18 11:29:31 2009 +0100
committer Sascha Hauer <s.hauer@pengutronix.de> Fri Aug 07 12:10:56 2009 +0200
tree c541967f2612fb28402a4bab3609462856da3ac5
parent 9b0e6db0da1ea433f38b8d952108746f3fc67304

imxfb: calculate bpix value from bits_per_pixel

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

drivers/video/imxfb.c

diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 15a0ee6..a8c41cb 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -33,6 +33,7 @@
 #include <linux/math64.h>
 
 #include <mach/imxfb.h>
+#include <mach/hardware.h>
 
 /*
  * Complain if VAR is out of range.
@@ -530,8 +531,24 @@
 				lcd_clk / pcr);
 	}
 
+	switch (var->bits_per_pixel) {
+	case 32:
+		pcr |= PCR_BPIX_18;
+		break;
+	case 16:
+	default:
+		if (cpu_is_mx1())
+			pcr |= PCR_BPIX_12;
+		else
+			pcr |= PCR_BPIX_16;
+		break;
+	case 8:
+		pcr |= PCR_BPIX_8;
+		break;
+	}
+
 	/* add sync polarities */
-	pcr |= fbi->pcr & ~0x3F;
+	pcr |= fbi->pcr & ~(0x3f | (7 << 25));
 
 	writel(pcr, fbi->regs + LCDC_PCR);
 	writel(fbi->pwmr, fbi->regs + LCDC_PWMR);