[commit] r2461 - dev/olpc/dcon

[repository service]

Author: wmb
Date: Tue Aug 16 02:45:53 2011
New Revision: 2461
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2461

Log:
OLPC XO-1.75 - enabled DCON freeze functionality since some machines now support it.

Modified:
   dev/olpc/dcon/mmp2dcon.fth

Modified: dev/olpc/dcon/mmp2dcon.fth
==============================================================================
--- dev/olpc/dcon/mmp2dcon.fth	Sat Aug 13 02:51:41 2011	(r2460)
+++ dev/olpc/dcon/mmp2dcon.fth	Tue Aug 16 02:45:53 2011	(r2461)
@@ -1,6 +1,11 @@
 \ See license at end of file
 \ " dcon" device-name

+new-device
+" dcon" device-name
+" olpc,xo1-dcon" +compatible
+finish-device
+
 \ DCON internal registers, accessed via I2C
 \ 0 constant DCON_ID
 \ 1 constant DCON_MODE
@@ -52,7 +57,7 @@
 : dcon-unload  ( -- )  d# 142 gpio-clr  ;
 [then]
 \ : dcon-blnk?  ( -- flag )  ;  \ Not hooked up
-: dcon-stat@  ( -- n )  h# d4019100 l@ 4 rshift 3 and  ;
+: dcon-stat@  ( -- n )  h# 019100 io@ 4 rshift 3 and  ;
 : dcon-irq?  ( -- flag )  d# 124 gpio-pin@  0=  ;

\ DCONSTAT values:  0 SCANINT  1 SCANINT_DCON  2 DISPLAYLOAD  3 MISSED
@@ -60,8 +65,6 @@
 1 value vga? \ VGA
 0 value color? \ COLOUR

-\ : gxfb!  ( l offset -- )  gxfb-dc-regs +  rl!  ;  \ Probably should be IO mapped
-
 d# 905 value resumeline  \ Configurable; should be set from args

: wait-output  ( -- )  d# 40 ms  ;
@@ -99,7 +102,6 @@
       dcon-load  \ Put the DCON in VGA-refreshed mode
       d# 25 ms   \ Ensure that that DCON sees the DCONLOAD high
 \      display-on
-[ifdef] notdef
    else
       begin                             ( )
          dcon-unload  \ Put the DCON in self-refresh mode
@@ -109,7 +111,6 @@
          \ We got a false ack from the DCON so start over from LOAD state
          dcon-load  d# 25 ms            ( )
       repeat                            ( )
-[then]
    then
 ;