[Hackndev-commit] SF.net SVN: hackndev: [794] linux4palm/linux/trunk/arch/arm/mach-pxa/ palmz72/palmz72_battery.c

[<hap...@us...>]

Revision: 794
          http://svn.sourceforge.net/hackndev/?rev=794&view=rev
Author:   happy-slapin
Date:     2007-02-03 13:40:24 -0800 (Sat, 03 Feb 2007)

Log Message:
-----------
z72: final version of battery driver

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c	2007-02-03 02:09:26 UTC (rev 793)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmz72/palmz72_battery.c	2007-02-03 21:40:24 UTC (rev 794)
@@ -72,7 +72,7 @@
 {
     if (bat.battery_registered){
     	bat.previous_voltage = bat.current_voltage;
-    	bat.current_voltage = wm97xx_read_aux_adc(bat.wm, TS_BMON);
+    	bat.current_voltage = wm97xx_read_aux_adc(bat.wm,  WM97XX_AUX_ID3);
 	bat.last_battery_update = jiffies;
 	printk("Battery [mV]: %d\n", bat.current_voltage * 1889/1000 + 7678/10 );
     	return bat.current_voltage * 1889/1000 + 7678/10;
@@ -125,7 +125,7 @@
 static void
 palmz72_wm97xx_shutdown(struct device *dev)
 {
-#ifdef CONFIG_APM
+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
     apm_get_power_status = apm_get_power_status_orig;
 #endif
 }
@@ -165,7 +165,7 @@
 	return ret;
 }
 
-#ifdef CONFIG_APM
+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
 
 /* APM status query callback implementation */
 static void palmz72_apm_get_power_status(struct apm_power_info *info)
@@ -213,7 +213,7 @@
 	bat.battery_registered = 1;
 	printk("Battery registered\n");
     }
-#ifdef CONFIG_APM
+#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
     apm_get_power_status_orig = apm_get_power_status;
     apm_get_power_status = palmz72_apm_get_power_status;
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.