Commit 576b3ef2 authored by Dirk Opfer's avatar Dirk Opfer Committed by Russell King

[ARM] 3864/1: Refactore sharpsl_pm

This patch adds another hook into sharpsl_pm to notify the machine
specific driver immediately after resume. This is needed to support the Sharp SL-6000 (Tosa).
Signed-off-by: default avatarDirk Opfer <Dirk@Opfer-Online.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a2025e7f
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#define SHARPSL_CHARGE_FINISH_TIME (msecs_to_jiffies(10*60*1000)) /* 10 min */ #define SHARPSL_CHARGE_FINISH_TIME (msecs_to_jiffies(10*60*1000)) /* 10 min */
#define SHARPSL_BATCHK_TIME (msecs_to_jiffies(15*1000)) /* 15 sec */ #define SHARPSL_BATCHK_TIME (msecs_to_jiffies(15*1000)) /* 15 sec */
#define SHARPSL_BATCHK_TIME_SUSPEND (60*10) /* 10 min */ #define SHARPSL_BATCHK_TIME_SUSPEND (60*10) /* 10 min */
#define SHARPSL_WAIT_CO_TIME 15 /* 15 sec */ #define SHARPSL_WAIT_CO_TIME 15 /* 15 sec */
#define SHARPSL_WAIT_DISCHARGE_ON 100 /* 100 msec */ #define SHARPSL_WAIT_DISCHARGE_ON 100 /* 100 msec */
#define SHARPSL_CHECK_BATTERY_WAIT_TIME_TEMP 10 /* 10 msec */ #define SHARPSL_CHECK_BATTERY_WAIT_TIME_TEMP 10 /* 10 msec */
...@@ -575,6 +576,9 @@ static int corgi_pxa_pm_enter(suspend_state_t state) ...@@ -575,6 +576,9 @@ static int corgi_pxa_pm_enter(suspend_state_t state)
while (corgi_enter_suspend(alarm_time,alarm_status,state)) while (corgi_enter_suspend(alarm_time,alarm_status,state))
{} {}
if (sharpsl_pm.machinfo->earlyresume)
sharpsl_pm.machinfo->earlyresume();
dev_dbg(sharpsl_pm.dev, "SharpSL resuming...\n"); dev_dbg(sharpsl_pm.dev, "SharpSL resuming...\n");
return 0; return 0;
......
...@@ -25,6 +25,7 @@ struct sharpsl_charger_machinfo { ...@@ -25,6 +25,7 @@ struct sharpsl_charger_machinfo {
void (*measure_temp)(int); void (*measure_temp)(int);
void (*presuspend)(void); void (*presuspend)(void);
void (*postsuspend)(void); void (*postsuspend)(void);
void (*earlyresume)(void);
unsigned long (*read_devdata)(int); unsigned long (*read_devdata)(int);
#define SHARPSL_BATT_VOLT 1 #define SHARPSL_BATT_VOLT 1
#define SHARPSL_BATT_TEMP 2 #define SHARPSL_BATT_TEMP 2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment