linux-omap2-git: Sync with OE.dev, add fixes to compile correctly with gcc 4.3.1

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5009 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-08-03 11:21:36 +00:00
parent 6dda6e3c3e
commit 5e4da78218
29 changed files with 2747 additions and 152 deletions

View File

@@ -0,0 +1,28 @@
From: Mans Rullgard <mans@mansr.com>
Date: Sun, 6 Jul 2008 13:22:54 +0000 (+0100)
Subject: omapfb: use PCD if set in panel config
X-Git-Tag: beagle-5
X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=c8060d36ae156771f00a7a27cabf1b4435c378bd
omapfb: use PCD if set in panel config
---
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c
index 3b36227..4e1a8e3 100644
--- a/drivers/video/omap/dispc.c
+++ b/drivers/video/omap/dispc.c
@@ -798,7 +798,13 @@ static void set_lcd_timings(void)
l |= panel->acb & 0xff;
dispc_write_reg(DISPC_POL_FREQ, l);
- calc_ck_div(is_tft, panel->pixel_clock * 1000, &lck_div, &pck_div);
+ if (panel->pcd) {
+ pck_div = panel->pcd;
+ lck_div = 1;
+ } else {
+ calc_ck_div(is_tft, panel->pixel_clock * 1000,
+ &lck_div, &pck_div);
+ }
l = dispc_read_reg(DISPC_DIVISOR);
l &= ~(FLD_MASK(16, 8) | FLD_MASK(0, 8));