[commit] r2583 - cpu/arm/mmp2 dev

[repository service]

Author: wmb
Date: Wed Oct  5 02:49:00 2011
New Revision: 2583
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2583

Log:
OLPC XO-1.75 - trac #11300 - WLAN now works after suspend/resume.  Previously, it worked after suspend/resume only if it had not been opened prior to suspend.

Modified:
   cpu/arm/mmp2/dramrecal.fth
   dev/libertas.fth

Modified: cpu/arm/mmp2/dramrecal.fth
==============================================================================
--- cpu/arm/mmp2/dramrecal.fth	Wed Oct  5 02:47:39 2011	(r2582)
+++ cpu/arm/mmp2/dramrecal.fth	Wed Oct  5 02:49:00 2011	(r2583)
@@ -687,10 +687,18 @@
    \ 0 h# 54 pmua!  \ Kill the SDIO 0 clocks - insignificant savings
    \ 0 h# 58 pmua!  \ Kill the SDIO 1 clocks - insignificant savings
    sleep-mask 2 and  0=  if  keyboard-power-off  then  \ Should save about 17 mW
-   sleep-mask 4 and  if  wlan-stay-on  else  wlan-power-off  then  \ saves 100 mW
+   sleep-mask 4 and  if
+      wlan-stay-on
+   else
+      " /wlan" " suspend" execute-device-method drop
+      wlan-power-off
+   then  \ saves 100 mW
 ;
 : screen-on  ( -- )
-   sleep-mask 4 and  0=  if  wlan-power-on       then
+   sleep-mask 4 and  0=  if
+      wlan-power-on
+      " /wlan" " resume" execute-device-method drop
+   then
    sleep-mask 2 and  0=  if  keyboard-power-on   then 
    " clr-ack" $call-ec
    " resume" $call-screen

Modified: dev/libertas.fth
==============================================================================
--- dev/libertas.fth	Wed Oct  5 02:47:39 2011	(r2582)
+++ dev/libertas.fth	Wed Oct  5 02:49:00 2011	(r2583)
@@ -604,6 +604,8 @@
    ds-not-ready to driver-state
    reset-host-bus
 ;
+: suspend  ( -- )  reset-wlan  ;
+: resume  ( -- )  ;

: marvel-get-hw-spec  ( -- true | adr false )
    d# 38 h# 03 ( CMD_GET_HW_SPEC ) prepare-cmd