Changeset 2944

Timestamp:

Apr 17, 2012 3:04:04 AM (13 months ago)

Author:

quozl

Message:

OLPC XO-1.75 - restore thermal protection after suspend, #11779

Location:

cpu/arm/mmp2

Files:

• dramrecal.fth (modified) (1 diff)
• thermal.fth (modified) (2 diffs)

cpu/arm/mmp2/dramrecal.fth

@@ -870 +870 @@
    resume-usb
    enable-interrupts
+   init-thermal-sensor
 ;
 : strp  ( -- )  ec-rst-pwr  str  ec-max-pwr .d ." mW " soc .%  space  ;

cpu/arm/mmp2/thermal.fth

@@ -2 +2 @@
 purpose: Driver for the MMP2 thermal sensor
 
+\ See also cforth:src/app/arm-xo-1.75/thermal.fth
 h# 013200 value thermal-base
+: room-temp@  ( -- n )  thermal-base io@  ;
+: room-temp!  ( n -- )  thermal-base io!  ;
+thermal-base h# 4 +  value wd-thresh
+: wd-thresh@  ( -- n )  wd-thresh io@  ;
+: wd-thresh!  ( n -- )  wd-thresh io!  ;
+\ thermal-base h# 8 +  value lo-thresh
+\ thermal-base h# c +  value hi-thresh
+thermal-base h# 10 +  value ts-ctrl
+: ts-ctrl!  ( n -- )  ts-ctrl io!  ;
+
 : init-thermal-sensor  ( -- )
    thermal-base io@ h# 400 and  if  exit  then
    7 h# 90 apbc!   3 h# 90 apbc!  \ Enable clocks to thermal sensor
-   h# 10000 thermal-base io!      \ Enable sensing
+   h# 10000 room-temp!            \ Enable sensing
+   d# 696 wd-thresh!              \ Set thermal watchdog threshold to 85C
+   h# 88 ts-ctrl!                 \ Clear thermal watchdog reset status
+                                  \ Set thermal watchdog reset enable
 ;
 
@@ -46 +60 @@
    wdtpcr io!
 ;
-
-thermal-base h# 4 +  value wd-thresh
-: wd-thresh@  ( -- n )  wd-thresh io@  ;
-: wd-thresh!  ( n -- )  wd-thresh io!  ;
 
 : .c  ( n -- )  (.) type ." C " ;