diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-21 11:03:25 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-22 22:03:20 +0200 |
| commit | 511365a27aa69983c0bc2206d54a5b45a63a8ebb (patch) | |
| tree | 4d236f225b8eb16cb74ed73e0e6f9c0fe5e75466 /recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch | |
| parent | 0efc37504d3552c5f8c15d99ad3d89379ffec617 (diff) | |
linux-openmoko-2.6.32: update stable patch to 2.6.32.16, rebase some patches and add possible WS fix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch')
| -rw-r--r-- | recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch b/recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch new file mode 100644 index 0000000000..e96a87d290 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0016-jbt6k74-fix-WS.patch @@ -0,0 +1,64 @@ +From 99ce90618a47cdc8c373838b7ee04348cc21d303 Mon Sep 17 00:00:00 2001 +From: Thibaut Girka <thib@sitedethib.com> +Date: Wed, 21 Jul 2010 09:40:29 +0200 +Subject: [PATCH 16/23] jbt6k74: fix WS + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + drivers/video/backlight/jbt6k74.c | 15 +++++++++++---- + 1 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/drivers/video/backlight/jbt6k74.c b/drivers/video/backlight/jbt6k74.c +index 56a3e3a..4db021f 100644 +--- a/drivers/video/backlight/jbt6k74.c ++++ b/drivers/video/backlight/jbt6k74.c +@@ -268,8 +268,7 @@ static int jbt_off_to_normal(struct jbt_info *jbt) + + gpio_set_value_cansleep(pdata->gpio_reset, 1); + ret = regulator_bulk_enable(ARRAY_SIZE(jbt->supplies), jbt->supplies); +- +- mdelay(120); ++ mdelay(200); + + /* three times command zero */ + ret |= jbt_reg_write_nodata(jbt, 0x00); +@@ -282,10 +281,16 @@ static int jbt_off_to_normal(struct jbt_info *jbt) + /* deep standby out */ + ret |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x11); + mdelay(1); ++ if (ret != 0) ++ printk (KERN_ERR "Ignored ret value:%i",ret); ++ + ret |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x28); + + /* (re)initialize register set */ + ret |= jbt_init_regs(jbt); ++ if (ret != 0) ++ printk (KERN_ERR "Ignored ret value2:%i",ret); ++ + + /* Make sure we are 120 ms after SLEEP_OUT */ + if (time_before(jiffies, jbt->next_sleep)) +@@ -644,7 +649,7 @@ static int jbt6k74_set_power(struct lcd_device *ld, int power) + struct jbt_info *jbt = dev_get_drvdata(&ld->dev); + + jbt->blank_mode = power; +- cancel_rearming_delayed_work(&jbt->blank_work); ++ //cancel_rearming_delayed_work(&jbt->blank_work); + + switch (power) { + case FB_BLANK_UNBLANK: +@@ -658,7 +663,9 @@ static int jbt6k74_set_power(struct lcd_device *ld, int power) + break; + case FB_BLANK_POWERDOWN: + dev_dbg(&jbt->spi->dev, "powerdown\n"); +- ret = jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF); ++ //ret = schedule_delayed_work(&jbt->blank_work, HZ); ++ jbt6k74_enter_power_mode(jbt, JBT_POWER_MODE_OFF); ++ ret = 1; + break; + default: + break; +-- +1.7.1.1 + |