Author: titmuss
Date: Sun Feb 10 16:34:08 2008
New Revision: 1898
URL: http://svn.slimdevices.com?rev=1898&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r1887): titmuss | 2008-02-10 21:05:04 +0000
Bug: 6580, 6922
Description:
Turn off Power Management debugging, this was causing resume crashes when jive
was not
connected to a dongle.
Add a small delay before turning on the lcd backlight during boot. This avoids
a white
flash before the logitech logo.
Fix to prevent backlight and key lcd flash on resume.
Remove code turning on GPB6, this is no longer used a backlight enable on the
recent
hardware.
Modified:
trunk/ (props changed)
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/.config
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Propchange: trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Feb 10 16:34:08 2008
@@ -1,3 +1,3 @@
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1886
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:1887
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/.config
URL:
http://svn.slimdevices.com/trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/.config?rev=1898&root=Jive&r1=1897&r2=1898&view=diff
==============================================================================
--- trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/.config (original)
+++ trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/.config Sun Feb 10 16:34:08
2008
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22-P7
-# Tue Jan 29 13:44:22 2008
+# Linux kernel version: 2.6.22
+# Sun Feb 10 11:26:29 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -149,7 +149,7 @@
CONFIG_PLAT_S3C24XX=y
# CONFIG_S3C2410_BOOT_WATCHDOG is not set
CONFIG_S3C2410_BOOT_ERROR_RESET=y
-CONFIG_S3C2410_PM_DEBUG=y
+# CONFIG_S3C2410_PM_DEBUG is not set
# CONFIG_S3C2410_PM_CHECK is not set
CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
CONFIG_S3C2410_DMA=y
Modified:
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
URL:
http://svn.slimdevices.com/trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c?rev=1898&root=Jive&r1=1897&r2=1898&view=diff
==============================================================================
---
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
(original)
+++
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/arch/arm/mach-s3c2412/mach-jive.c
Sun Feb 10 16:34:08 2008
@@ -40,6 +40,7 @@
#include <asm/arch/regs-gpio.h>
#include <asm/arch/regs-mem.h>
#include <asm/arch/regs-lcd.h>
+#include <asm/arch/regs-timer.h>
#include <asm/mach-types.h>
@@ -377,6 +378,12 @@
s3c2410_gpio_setpin(S3C2410_GPB0, 0);
s3c2410_gpio_cfgpin(S3C2410_GPB0, S3C2410_GPIO_OUTPUT);
} else if (pre == 0 && to == 1) {
+ /*
+ * delay to make sure framebuffer flip is complete,
+ * this avoids a bright flash on boot.
+ */
+ msleep(50);
+
s3c2410_gpio_cfgpin(S3C2410_GPB0, S3C2410_GPB0_TOUT0);
}
}
Modified:
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
URL:
http://svn.slimdevices.com/trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c?rev=1898&root=Jive&r1=1897&r2=1898&view=diff
==============================================================================
---
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
(original)
+++
trunk/squeezeboxJive/src/kernel-P7/linux-2.6.22/drivers/char/jive/jive_mgmt.c
Sun Feb 10 16:34:08 2008
@@ -197,7 +197,7 @@
static int slide_pwm_value(int _value)
{
if (_value == 0)
- _value = MAX_DIMMER;
+ _value = 0;
else if (_value > MAX_DIMMER)
_value = MAX_DIMMER-1;
else _value--;
@@ -205,7 +205,6 @@
}
static void init_pwm(int pin, int val) {
-
if (pin==0) {
//RAW(S3C2410_GPBCON) &= ~(S3C2410_GPB0_TOUT0|S3C2410_GPB0_OUTP);
//RAW(S3C2410_GPBCON) |= S3C2410_GPB0_TOUT0; //
GPB0 - TOUT0
@@ -266,7 +265,6 @@
case JIVE_MGMT_IOCSLCDBACKLIGHT:
set_pwm(0, val);
- s3c2410_gpio_setpin(S3C2410_GPB6, (val > 0));
break;
case JIVE_MGMT_IOCGLCDBACKLIGHT:
@@ -450,11 +448,6 @@
local_irq_save(flags);
init_pwm(0, MAX_DIMMER);
local_irq_restore(flags);
-
- // GPB6 => BACKLIGHT_ENABLE
- s3c2410_gpio_cfgpin(S3C2410_GPB6, S3C2410_GPB6_OUTP);
- s3c2410_gpio_pullup(S3C2410_GPB6, 0);
- s3c2410_gpio_setpin(S3C2410_GPB6, 1);
// TOUT2 => LED0
local_irq_save(flags);
@@ -594,6 +587,13 @@
pwm0 = get_pwm(0);
pwm2 = get_pwm(2);
+ /* Turn off backlight and LEDs, so they remain off during resume */
+ s3c2410_gpio_setpin(S3C2410_GPB0, 0);
+ s3c2410_gpio_cfgpin(S3C2410_GPB0, S3C2410_GPIO_OUTPUT);
+
+ s3c2410_gpio_setpin(S3C2410_GPB2, 1);
+ s3c2410_gpio_cfgpin(S3C2410_GPB2, S3C2410_GPIO_OUTPUT);
+
return 0;
}
@@ -601,6 +601,9 @@
{
init_pwm(0, pwm0);
init_pwm(2, pwm2);
+
+ s3c2410_gpio_cfgpin(S3C2410_GPB0, S3C2410_GPB0_TOUT0);
+ s3c2410_gpio_cfgpin(S3C2410_GPB2, S3C2410_GPB2_TOUT2);
return 0;
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
