r4154 - branches/src/target/kernel/2.6.24.x/patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-03-04 03:58:52 +0100 (Tue, 04 Mar 2008)
New Revision: 4154

Modified:
   branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
Log:
From: matt_hsu <matt_hsu at openmoko.org>

Currently, the battery indication is not correct on Neo. It can be fixed
to apply the following changes. 

# Attached patch 

# Disable CONFIG_APM_POWER 
        Since this configuration would let apm_get_power_status is registered
to apm_battery_apm_get_power_status(). But it should be registered to
pcf50633_get_power_status.

[ Working towards resolving bug #255. ]



Modified: branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch	2008-03-04 02:51:52 UTC (rev 4153)
+++ branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch	2008-03-04 02:58:52 UTC (rev 4154)
@@ -34,7 +34,7 @@
 ===================================================================
 --- /dev/null
 +++ linux-2.6.24/drivers/i2c/chips/pcf50633.c
-@@ -0,0 +1,1963 @@
+@@ -0,0 +1,1964 @@
 +/* Philips PCF50633 Power Management Unit (PMU) driver
 + *
 + * (C) 2006-2007 by OpenMoko, Inc.
@@ -1194,9 +1194,9 @@
 +        struct pcf50633_data *pcf = pcf50633_global;
 +	u_int8_t chgmod = reg_read(pcf, PCF50633_REG_MBCS2) &
 +				   PCF50633_MBCS2_MBC_MASK;
-+	u_int16_t battvolt = 0; /* FIXME */
-+	//u_int16_t battvolt = pcf50606_battvolt(pcf);
 +
++	u_int16_t battvolt = pcf50633_battvolt(pcf);
++
 +	if (reg_read(pcf, PCF50633_REG_MBCS1) &
 +			(PCF50633_MBCS1_USBPRES|PCF50633_MBCS1_ADAPTPRES))
 +		info->ac_line_status = APM_AC_ONLINE;
@@ -1204,6 +1204,7 @@
 +		info->ac_line_status = APM_AC_OFFLINE;
 +
 +	switch (chgmod) {
++	case PCF50633_MBCS2_MBC_PLAY:
 +	case PCF50633_MBCS2_MBC_USB_PRE:
 +	case PCF50633_MBCS2_MBC_USB_PRE_WAIT:
 +	case PCF50633_MBCS2_MBC_USB_FAST_WAIT: