zaurus family: battery cleanups
Subsystems (3)
PATCH 1/1 zaurus family: battery cleanups
This cleans up battery code to conform to codingstyle. The only real change is that we should now refuse to charge if we can't read battery temperature.
arch/arm/mach-pxa/sharpsl_pm.c renamed from arch/arm.ofic/mach-pxa/sharpsl_pm.c +36 -119
@@ -78,92 +78,6 @@ -struct battery_thresh spitz_battery_levels_acin[] = { - {213 ,100 }, - {212 ,98 }, - {211 ,95 }, - {210 ,93 }, - {209 ,90 }, - {208 ,88 }, - {207 ,85 }, - {206 ,83 }, - {205 ,80 }, - {204 ,78 }, - {203 ,75 }, - {202 ,73 }, - {201 ,70 }, - {200 ,68 }, - {199 ,65 }, - {198 ,63 }, - {197 ,60 }, - {196 ,58 }, - {195 ,55 }, - {194 ,53 }, - {193 ,50 }, - {192 ,48 }, - {192 ,45 }, - {191 ,43 }, - {191 ,40 }, - {190 ,38 }, - {190 ,35 }, - {189 ,33 }, - {188 ,30 }, - {187 ,28 }, - {186 ,25 }, - {185 ,23 }, - {184 ,20 }, - {183 ,18 }, - {182 ,15 }, - {181 ,13 }, - {180 ,10 }, - {179 ,8 }, - {178 ,5 }, - {0 ,0 }, -}; - -struct battery_thresh spitz_battery_levels_noac[] = { - {213 ,100 }, - {212 ,98 }, - {211 ,95 }, - {210 ,93 }, - {209 ,90 }, - {208 ,88 }, - {207 ,85 }, - {206 ,83 }, - {205 ,80 }, - {204 ,78 }, - {203 ,75 }, - {202 ,73 }, - {201 ,70 }, - {200 ,68 }, - {199 ,65 }, - {198 ,63 }, - {197 ,60 }, - {196 ,58 }, - {195 ,55 }, - {194 ,53 }, - {193 ,50 }, - {192 ,48 }, - {191 ,45 }, - {190 ,43 }, - {189 ,40 }, - {188 ,38 }, - {187 ,35 }, - {186 ,33 }, - {185 ,30 }, - {184 ,28 }, - {183 ,25 }, - {182 ,23 }, - {181 ,20 }, - {180 ,18 }, - {179 ,15 }, - {178 ,13 }, - {177 ,10 }, - {176 ,8 }, - {175 ,5 }, - {0 ,0 }, -}; -/* MAX1111 Commands */ #define MAXCTRL_PD0 1u << 0#define MAXCTRL_PD1 1u << 1
@@ -238,7 +152,7 @@static void sharpsl_battery_thread (struct work_struct *private_) { -int voltage, percent, apm_status, i =0 ; +int voltage, percent, apm_status, i;if (!sharpsl_pm.machinfo)return ;
@@ -250,15 +164,13 @@ && time_after(jiffies, sharpsl_pm.charge_start_time + SHARPSL_CHARGE_ON_TIME_INTERVAL))schedule_delayed_work (&toggle_charger,0 ); -while (1 ) { +for (i=0 ; i<5 ; i++) { voltage = sharpsl_pm.machinfo->read_devdata (SHARPSL_BATT_VOLT ); -if (voltage >0 )break ; -if (i++ >5 ) { - voltage = sharpsl_pm.machinfo->bat_levels_noac[0 ].voltage; -dev_warn (sharpsl_pm.dev,"Warning: Cannot read main battery!\n" ); -break ; - } + } +if (voltage <=0 ) { + voltage = sharpsl_pm.machinfo->bat_levels_noac[0 ].voltage; +dev_warn (sharpsl_pm.dev,"Warning: Cannot read main battery!\n" ); } voltage =sharpsl_average_value (voltage);
@@ -267,7 +179,9 @@/* At low battery voltages, the voltage has a tendency to start creeping back up so we try to avoid this here */ -if ((sharpsl_pm.battstat.ac_status ==APM_AC_ONLINE ) || (apm_status ==APM_BATTERY_STATUS_HIGH ) || percent <= sharpsl_pm.battstat.mainbat_percent) { +if ((sharpsl_pm.battstat.ac_status ==APM_AC_ONLINE ) + || (apm_status ==APM_BATTERY_STATUS_HIGH ) + || percent <= sharpsl_pm.battstat.mainbat_percent) { sharpsl_pm.battstat.mainbat_voltage = voltage; sharpsl_pm.battstat.mainbat_status = apm_status; sharpsl_pm.battstat.mainbat_percent = percent;
@@ -279,8 +193,8 @@#ifdef CONFIG_BACKLIGHT_CORGI /* If battery is low. limit backlight intensity to save power. */ if ((sharpsl_pm.battstat.ac_status !=APM_AC_ONLINE ) - && ((sharpsl_pm.battstat.mainbat_status ==APM_BATTERY_STATUS_LOW ) || - (sharpsl_pm.battstat.mainbat_status ==APM_BATTERY_STATUS_CRITICAL ))) { + && ((sharpsl_pm.battstat.mainbat_status ==APM_BATTERY_STATUS_LOW ) + || (sharpsl_pm.battstat.mainbat_status ==APM_BATTERY_STATUS_CRITICAL ))) {if (!(sharpsl_pm.flags &SHARPSL_BL_LIMIT )) { sharpsl_pm.machinfo->backlight_limit (1 ); sharpsl_pm.flags |=SHARPSL_BL_LIMIT ;
@@ -293,8 +207,8 @@/* Suspend if critical battery level */ if ((sharpsl_pm.battstat.ac_status !=APM_AC_ONLINE ) - && (sharpsl_pm.battstat.mainbat_status ==APM_BATTERY_STATUS_CRITICAL ) - && !(sharpsl_pm.flags &SHARPSL_APM_QUEUED )) { + && (sharpsl_pm.battstat.mainbat_status ==APM_BATTERY_STATUS_CRITICAL ) + && !(sharpsl_pm.flags &SHARPSL_APM_QUEUED )) { sharpsl_pm.flags |=SHARPSL_APM_QUEUED ;dev_err (sharpsl_pm.dev,"Fatal Off\n" );apm_queue_event (APM_CRITICAL_SUSPEND );
@@ -339,6 +253,8 @@static void sharpsl_charge_error (void ) { +dev_warn (sharpsl_pm.dev,"Charger Error\n" ); +sharpsl_pm_led (SHARPSL_LED_ERROR ); sharpsl_pm.machinfo->charge (0 ); sharpsl_pm.charge_mode =CHRG_ERROR ;
@@ -346,7 +262,7 @@static void sharpsl_charge_toggle (struct work_struct *private_) { -dev_dbg (sharpsl_pm.dev,"Toogling Charger at time: %lx\n" , jiffies); +dev_dbg (sharpsl_pm.dev,"Toggling Charger at time: %lx\n" , jiffies);if (!sharpsl_pm.machinfo->read_devdata (SHARPSL_STATUS_ACIN )) {sharpsl_charge_off ();
@@ -535,8 +451,10 @@ val =get_select_val (buff);dev_dbg (sharpsl_pm.dev,"Temperature: %d\n" , val); -if (val > sharpsl_pm.machinfo->charge_on_temp) { -printk (KERN_WARNING "Not charging: temperature out of limits.\n" ); +/* FIXME: this should catch battery read errors, but we should +probably avoid charging in <0C temperatures, too. */ +if ((val <0 ) || (val > sharpsl_pm.machinfo->charge_on_temp)) { +dev_warn (sharpsl_pm.dev,"Not charging: temperature %d out of limits.\n" , val);return -1 ; }
@@ -590,7 +508,7 @@dev_dbg (sharpsl_pm.dev,"AC Voltage: %d\n" ,temp);if ((temp > sharpsl_pm.machinfo->charge_acin_high) || (temp < sharpsl_pm.machinfo->charge_acin_low)) { -dev_err (sharpsl_pm.dev,"Error: AC check failed.\n" ); +dev_err (sharpsl_pm.dev,"Error: AC check failed: voltage %d.\n" , temp);return -1 ; }
@@ -624,9 +542,9 @@static void corgi_goto_sleep (unsigned long alarm_time,unsigned int alarm_enable,suspend_state_t state) { -dev_dbg (sharpsl_pm.dev,"Time is: %08x\n" ,RCNR ); +dev_dbg (sharpsl_pm.dev,"Time is: %08x\n" ,RCNR ); -dev_dbg (sharpsl_pm.dev,"Offline Charge Activate = %d\n" ,sharpsl_pm.flags &SHARPSL_DO_OFFLINE_CHRG ); +dev_dbg (sharpsl_pm.dev,"Offline Charge Activate = %d\n" , sharpsl_pm.flags &SHARPSL_DO_OFFLINE_CHRG );/* not charging and AC-IN! */ if ((sharpsl_pm.flags &SHARPSL_DO_OFFLINE_CHRG ) && (sharpsl_pm.machinfo->read_devdata (SHARPSL_STATUS_ACIN ))) {
@@ -644,12 +562,12 @@if ((sharpsl_pm.charge_mode ==CHRG_ON ) && ((alarm_enable && ((alarm_time -RCNR ) > (SHARPSL_BATCHK_TIME_SUSPEND +30 ))) || !alarm_enable)) {RTSR &=RTSR_ALE ;RTAR =RCNR +SHARPSL_BATCHK_TIME_SUSPEND ; -dev_dbg (sharpsl_pm.dev,"Charging alarm at: %08x\n" ,RTAR ); +dev_dbg (sharpsl_pm.dev,"Charging alarm at: %08x\n" ,RTAR ); sharpsl_pm.flags |=SHARPSL_ALARM_ACTIVE ; }else if (alarm_enable) {RTSR &=RTSR_ALE ;RTAR = alarm_time; -dev_dbg (sharpsl_pm.dev,"User alarm at: %08x\n" ,RTAR ); +dev_dbg (sharpsl_pm.dev,"User alarm at: %08x\n" ,RTAR ); }else {dev_dbg (sharpsl_pm.dev,"No alarms set.\n" ); }
@@ -658,7 +576,7 @@ sharpsl_pm.machinfo->postsuspend (); -dev_dbg (sharpsl_pm.dev,"Corgi woken up from suspend: %08x\n" ,PEDR ); +dev_dbg (sharpsl_pm.dev,"Corgi woken up from suspend: %08x\n" ,PEDR ); }static int corgi_enter_suspend (unsigned long alarm_time,unsigned int alarm_enable,suspend_state_t state)
@@ -670,7 +588,7 @@corgi_goto_sleep (alarm_time, alarm_enable, state);return 1 ; } -if (sharpsl_off_charge_battery ()) { +if (sharpsl_off_charge_battery ()) {dev_dbg (sharpsl_pm.dev,"Charging. Suspend...\n" );corgi_goto_sleep (alarm_time, alarm_enable, state);return 1 ;
@@ -678,8 +596,8 @@dev_dbg (sharpsl_pm.dev,"User triggered wakeup in offline charger.\n" ); } -if ((!sharpsl_pm.machinfo->read_devdata (SHARPSL_STATUS_LOCK )) || (sharpsl_fatal_check () <0 ) ) - { +if ((!sharpsl_pm.machinfo->read_devdata (SHARPSL_STATUS_LOCK )) || + (!sharpsl_pm.machinfo->read_devdata (SHARPSL_STATUS_FATAL ))) {dev_err (sharpsl_pm.dev,"Fatal condition. Suspend.\n" );corgi_goto_sleep (alarm_time, alarm_enable, state);return 1 ;
@@ -697,7 +615,7 @@corgi_goto_sleep (alarm_time, alarm_status, state); -while (corgi_enter_suspend (alarm_time,alarm_status,state)) +while (corgi_enter_suspend (alarm_time, alarm_status, state)) {}if (sharpsl_pm.machinfo->earlyresume)
@@ -812,7 +730,7 @@mdelay (SHARPSL_CHARGE_CO_CHECK_TIME ); time =RCNR ; -while (1 ) { +while (1 ) {/* Check if any wakeup event had occurred */ if (sharpsl_pm.machinfo->charger_wakeup () !=0 )return 0 ;
@@ -835,9 +753,9 @@mdelay (SHARPSL_CHARGE_CO_CHECK_TIME ); time =RCNR ; -while (1 ) { +while (1 ) {/* Check if any wakeup event had occurred */ -if (sharpsl_pm.machinfo->charger_wakeup () !=0 ) +if (sharpsl_pm.machinfo->charger_wakeup ())return 0 ;/* Check for timeout */ if ((RCNR -time) >SHARPSL_WAIT_CO_TIME ) {
@@ -864,12 +782,12 @@static ssize_t battery_percentage_show (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%d\n" ,sharpsl_pm.battstat.mainbat_percent); +return sprintf (buf,"%d\n" , sharpsl_pm.battstat.mainbat_percent); }static ssize_t battery_voltage_show (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%d\n" ,sharpsl_pm.battstat.mainbat_voltage); +return sprintf (buf,"%d\n" , sharpsl_pm.battstat.mainbat_voltage); } static DEVICE_ATTR(battery_percentage, 0444, battery_percentage_show, NULL);
@@ -943,8 +861,7 @@ } } -if (sharpsl_pm.machinfo->batfull_irq) - { +if (sharpsl_pm.machinfo->batfull_irq) {/* Register interrupt handler. */ if (request_irq (IRQ_GPIO (sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr,IRQF_DISABLED |IRQF_TRIGGER_RISING ,"CO" , sharpsl_chrg_full_isr)) {dev_err (sharpsl_pm.dev,"Could not get irq %d.\n" ,IRQ_GPIO (sharpsl_pm.machinfo->gpio_batfull));
Only in linux-rc/arch/arm/mach-pxa: sharpsl_pm.c.orig
Only in linux-rc/arch/arm/mach-pxa: sharpsl_pm.c~
Binary files linux-rc/arch/arm.ofic/mach-pxa/sharpsl_pm.o and linux-rc/arch/arm/mach-pxa/sharpsl_pm.o differ
arch/arm/mach-pxa/spitz_pm.c renamed from arch/arm.ofic/mach-pxa/spitz_pm.c +87 -0
93 lines not on this page · raw message
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 3 lines · Pavel Machek
This cleans up battery code to conform to codingstyle. The only real change is that we should now refuse to charge if we can't read battery temperature.
This patch has a number of checkpatch errors. Mostly trailing whitespace, or just spacing issues..
Daniel
Quoted 7 lines · Daniel Walker
Quoted 3 lines · Pavel Machek
This cleans up battery code to conform to codingstyle. The only real change is that we should now refuse to charge if we can't read battery temperature.
This patch has a number of checkpatch errors. Mostly trailing whitespace, or just spacing issues..
Well, original code has problems, too, and I'm trying to slowly clean that up.
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 11 lines · Pavel Machek
Quoted 7 lines · Daniel Walker
Quoted 3 lines · Pavel Machek
This cleans up battery code to conform to codingstyle. The only real change is that we should now refuse to charge if we can't read battery temperature.
This patch has a number of checkpatch errors. Mostly trailing whitespace, or just spacing issues..
Well, original code has problems, too, and I'm trying to slowly clean that up.
Ok, but your adding new problems to the code .. So eventually these new problems would also need to get cleaned up.. If you don't add new problems and just clean up old problems, then your moving in the right direction (eventually no problems at all) ..
Daniel
PATCH v2 1/1 zaurus family: battery cleanups
In reply to Pavel MachekThis cleans up battery code to conform to codingstyle. The only real change is that we should now refuse to charge if we can't read battery temperature.
It now makes tables static const, and fixes non-crazy checkpatch errors.
arch/arm/mach-pxa/sharpsl.h renamed from arch/arm.ofic/mach-pxa/sharpsl.h +0 -2
@@ -42,8 +42,6 @@#define MAX1111_BATT_TEMP 2u#define MAX1111_ACIN_VOLT 6u -extern struct battery_thresh spitz_battery_levels_acin[]; -extern struct battery_thresh spitz_battery_levels_noac[];int sharpsl_pm_pxa_read_max1111 (int channel);
Only in linux/arch/arm/mach-pxa: sharpsl.h~
arch/arm/mach-pxa/sharpsl_pm.c renamed from arch/arm.ofic/mach-pxa/sharpsl_pm.c +62 -144
413 lines not on this page · raw message
arch/arm/mach-pxa/spitz_pm.c renamed from arch/arm.ofic/mach-pxa/spitz_pm.c +92 -5
133 lines not on this page · raw message
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html