[openfirmware] [commit] r2083 - cpu/x86/pc/olpc/via

[repository service]

Author: quozl
Date: Fri Dec 17 05:47:37 2010
New Revision: 2083
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2083

Log:
OLPC XO-1.5 - avoid wait for DCONBLNK.  Tested on OLPC OS 10.1.2.

Modified:
   cpu/x86/pc/olpc/via/startgfxrestore.fth

Modified: cpu/x86/pc/olpc/via/startgfxrestore.fth
==============================================================================
--- cpu/x86/pc/olpc/via/startgfxrestore.fth	Fri Dec 17 04:10:06 2010	(r2082)
+++ cpu/x86/pc/olpc/via/startgfxrestore.fth	Fri Dec 17 05:47:37 2010	(r2083)
@@ -303,7 +303,8 @@
 30 1e seq-set  \ Power up DVP1 pads
 0c 2a seq-set  \ Power up LVDS pads
 30 1b seq-set  \ Turn off primary engine clock to save power
-   
+
+[ifdef] resume-dcon
 d# 32000 wait-us
 \ Wait for DCON_BLNK to be low
 d# 100 # cx mov
@@ -315,7 +316,11 @@
    cx dec
 0= until  then  \ "then" resolves "while"
 
+\ This is a cheesy way to set the DCON LOAD bit --
+ff acpi-io-base 4d + port-wb  \ B1 and B2 - DCON LOAD is the 0x04 bit (bit number 2) of PMIO+4d
+ff acpi-io-base 4f + port-wb  \ A1 and A2 - DCON LOAD is the 0x10 bit (bit number 4) of PMIO+4f
 d# 19000 wait-us
+[then]
 
 then
 long-offsets !