[openfirmware] [commit] r2839 - cpu/arm/mmp2

[repository service]

Author: wmb
Date: Mon Jan 23 18:55:48 2012
New Revision: 2839
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2839

Log:
XO-1.75 and XO-3 suspend/resume - some improvements in wakeup-from-keystroke, but that feature is still not fully functional.

Modified:
   cpu/arm/mmp2/dramrecal.fth

Modified: cpu/arm/mmp2/dramrecal.fth
==============================================================================
--- cpu/arm/mmp2/dramrecal.fth	Mon Jan 23 18:55:44 2012	(r2838)
+++ cpu/arm/mmp2/dramrecal.fth	Mon Jan 23 18:55:48 2012	(r2839)
@@ -361,7 +361,10 @@
 \ XXX we might need to set GPIOs 71 and 160 (ps2 clocks), and perhaps the dat lines too,
 \ for non-sleep-mode control - or maybe for sleep mode control as inputs.
 \ We also may need to enable falling edge detects.
-: disable-int40  ( -- )  d# 40 disable-interrupt  ;
+: disable-int40  ( -- )
+   d# 40 disable-interrupt
+   1  h# 29.00cc  io-set   \ Unmask the inter-processor communications interrupt
+;
 
 : gpio-wakeup?  ( gpio# -- flag )
    h# 019800 over 5 rshift la+ l@  ( gpio# mask )
@@ -639,11 +642,10 @@
 ;
 \ How to wakeup from SP:
 : setup-key-wakeup  ( -- )
-   d# 24 d# 16 do  h# b1 i af!  loop  \ Wake SP on game keys
-   h# b0 d# 15 af!    \ Wake SP on rotate key
-   h# 220 d#  71 af!  \ Wake SP on KBD CLK falling edge
-   h# 221 d# 160 af!  \ Wake SP on TPD CLK falling edge
-   h# 20.0000  h# 4c +mpmu  io-set  \ Keypress wakes SP
+   d# 24 d# 15 do  h# b0 i af!  loop  \ Wake SoC on game keys
+   h# 220 d#  71 af!  \ Wake SoC on KBD CLK falling edge
+   h# 221 d# 160 af!  \ Wake SoC on TPD CLK falling edge
+   h# 4  h# 4c +mpmu  io-set  \ Pin edge (GPIO per datasheet) wakes SoC
    ['] disable-int40 d# 40 interrupt-handler!
    d# 40 enable-interrupt  \ SP to PJ4 communications interrupt
    1  h# 29.00cc  io-clr   \ Unmask the inter-processor communications interrupt