aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/glamo
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:09:37 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:09:37 +0000
commit0762384f24778657524c4aff890a5ba140164751 (patch)
treea29d00fa69c52ec03207db683386a76360f70389 /drivers/mfd/glamo
parent52f68385741c9c4458b10b0fd30d9955f3ee88be (diff)
fix-glamofb-cmdqueue-timeout.patch
loglevl=9 can cause failure to init glamo-fb problem seems to be too low timeout when text scrolling can delay commandqueue going empty Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd/glamo')
-rw-r--r--drivers/mfd/glamo/glamo-fb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
index f0d7600f9d8..87c742007e4 100644
--- a/drivers/mfd/glamo/glamo-fb.c
+++ b/drivers/mfd/glamo/glamo-fb.c
@@ -548,12 +548,13 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
{
+ /* DGCMdQempty -- 1 == command queue is empty */
return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
}
void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
{
- int timeout = 2000;
+ int timeout = 20000;
dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
if (on) {
@@ -605,7 +606,7 @@ EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
{
- int timeout = 2000;
+ int timeout = 20000;
dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
__FUNCTION__);