* [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume
@ 2009-09-30 20:32 ` Pavel Machek
0 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2009-09-30 20:32 UTC (permalink / raw)
To: linux-arm-kernel
Spitz resume was broken for year or likely two, and it would be very
nice to fix it for 2.6.31-stable release. One liner is below...
It is in 2.6.32-rc1/2, with some more signoffs...
Pavel
---
sharpsl_pm.c code tries to read battery state very early during
resume, but those battery meters are connected on SPI and that's only
resumed way later.
Replace the check with simple checking of battery fatal signal, that
actually works at this stage.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Tested-by: Stanislav Brabec <utx@penguin.cz>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
--- linux-rc/arch/arm.ofic/mach-pxa/sharpsl_pm.c 2009-08-28 00:19:10.000000000 +0200
+++ linux-rc/arch/arm/mach-pxa/sharpsl_pm.c 2009-09-04 11:18:33.000000000 +0200
@@ -678,8 +678,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;
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
----- End forwarded message -----
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 6+ messages in thread* [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume
@ 2009-09-30 20:32 ` Pavel Machek
0 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2009-09-30 20:32 UTC (permalink / raw)
To: rpurdie, lenz, kernel list, Dirk, arminlitzel, Cyril Hrubis,
thommycheck, linux-arm-kernel, dbaryshkov, omegamoon, eric.y.miao,
utx, stable
Spitz resume was broken for year or likely two, and it would be very
nice to fix it for 2.6.31-stable release. One liner is below...
It is in 2.6.32-rc1/2, with some more signoffs...
Pavel
---
sharpsl_pm.c code tries to read battery state very early during
resume, but those battery meters are connected on SPI and that's only
resumed way later.
Replace the check with simple checking of battery fatal signal, that
actually works at this stage.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Tested-by: Stanislav Brabec <utx@penguin.cz>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
--- linux-rc/arch/arm.ofic/mach-pxa/sharpsl_pm.c 2009-08-28 00:19:10.000000000 +0200
+++ linux-rc/arch/arm/mach-pxa/sharpsl_pm.c 2009-09-04 11:18:33.000000000 +0200
@@ -678,8 +678,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;
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
----- End forwarded message -----
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 6+ messages in thread* [stable] [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume
2009-09-30 20:32 ` Pavel Machek
@ 2009-09-30 23:27 ` Greg KH
-1 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2009-09-30 23:27 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Sep 30, 2009 at 10:32:52PM +0200, Pavel Machek wrote:
>
>
> Spitz resume was broken for year or likely two, and it would be very
> nice to fix it for 2.6.31-stable release. One liner is below...
>
> It is in 2.6.32-rc1/2, with some more signoffs...
Now queued up.
Next time please let me know what the git commit id is for the patch,
it's necessary for me to be able to include it in the -stable tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume
@ 2009-09-30 23:27 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2009-09-30 23:27 UTC (permalink / raw)
To: Pavel Machek
Cc: rpurdie, lenz, kernel list, Dirk, arminlitzel, Cyril Hrubis,
thommycheck, linux-arm-kernel, dbaryshkov, omegamoon, eric.y.miao,
utx, stable
On Wed, Sep 30, 2009 at 10:32:52PM +0200, Pavel Machek wrote:
>
>
> Spitz resume was broken for year or likely two, and it would be very
> nice to fix it for 2.6.31-stable release. One liner is below...
>
> It is in 2.6.32-rc1/2, with some more signoffs...
Now queued up.
Next time please let me know what the git commit id is for the patch,
it's necessary for me to be able to include it in the -stable tree.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [stable] [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume
2009-09-30 23:27 ` Greg KH
@ 2009-10-01 10:41 ` Pavel Machek
-1 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2009-10-01 10:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed 2009-09-30 16:27:57, Greg KH wrote:
> On Wed, Sep 30, 2009 at 10:32:52PM +0200, Pavel Machek wrote:
> >
> >
> > Spitz resume was broken for year or likely two, and it would be very
> > nice to fix it for 2.6.31-stable release. One liner is below...
> >
> > It is in 2.6.32-rc1/2, with some more signoffs...
>
> Now queued up.
Thanks.
> Next time please let me know what the git commit id is for the patch,
> it's necessary for me to be able to include it in the -stable tree.
Ook, will try to remember.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume
@ 2009-10-01 10:41 ` Pavel Machek
0 siblings, 0 replies; 6+ messages in thread
From: Pavel Machek @ 2009-10-01 10:41 UTC (permalink / raw)
To: Greg KH
Cc: rpurdie, lenz, kernel list, Dirk, arminlitzel, Cyril Hrubis,
thommycheck, linux-arm-kernel, dbaryshkov, omegamoon, eric.y.miao,
utx, stable
On Wed 2009-09-30 16:27:57, Greg KH wrote:
> On Wed, Sep 30, 2009 at 10:32:52PM +0200, Pavel Machek wrote:
> >
> >
> > Spitz resume was broken for year or likely two, and it would be very
> > nice to fix it for 2.6.31-stable release. One liner is below...
> >
> > It is in 2.6.32-rc1/2, with some more signoffs...
>
> Now queued up.
Thanks.
> Next time please let me know what the git commit id is for the patch,
> it's necessary for me to be able to include it in the -stable tree.
Ook, will try to remember.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-10-01 10:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-30 20:32 [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume Pavel Machek
2009-09-30 20:32 ` Pavel Machek
2009-09-30 23:27 ` [stable] " Greg KH
2009-09-30 23:27 ` Greg KH
2009-10-01 10:41 ` Pavel Machek
2009-10-01 10:41 ` Pavel Machek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.