r1432 - cpu/x86/pc/olpc/via

Author: rsmith
Date: 2009-10-27 04:47:17 +0100 (Tue, 27 Oct 2009)
New Revision: 1432

Modified:
   cpu/x86/pc/olpc/via/ioinit.fth
   cpu/x86/pc/olpc/via/resume.bth
Log:
OLPC: Remove the GPIO2 enable.

Turning this on caused IRQ 1 (keyboard) to go away.

Modified: cpu/x86/pc/olpc/via/ioinit.fth
===================================================================
--- cpu/x86/pc/olpc/via/ioinit.fth	2009-10-23 22:53:15 UTC (rev 1431)
+++ cpu/x86/pc/olpc/via/ioinit.fth	2009-10-27 03:47:17 UTC (rev 1432)
@@ -223,8 +223,7 @@
 [then]

[ifdef] xo-board
-   97 ff c0 mreg   \ Wait for power to go down before coming back up - needed for power-off
-                   \ Enable MSDT/MSCK as GPIO2/GPIO3.  GPIO2 is used for WLAN_EN
+   97 ff 80 mreg   \ Wait for power to go down before coming back up - needed for power-off
 \ NO! This doesn't work.  If these lines are set as GPIOs, the system
 \ will crash when you disable the internal KBC.
 \   97 ff 81 mreg  \ GPIO4/5 not KBDT/KBCK

Modified: cpu/x86/pc/olpc/via/resume.bth
===================================================================
--- cpu/x86/pc/olpc/via/resume.bth	2009-10-23 22:53:15 UTC (rev 1431)
+++ cpu/x86/pc/olpc/via/resume.bth	2009-10-27 03:47:17 UTC (rev 1432)
@@ -144,7 +144,6 @@

\ D17F0 Bus Control and Power Management
    h# 88d2 config-rb  al stos  \ SMBUS clock divisor
-   h# 8897 config-rb  al stos  \ GPIO2/3 rather than MSDT/MSCK

\ D17F7 South-North Module Interface Control
    h# 8f0d config-rb  al stos  \ Latency timer
@@ -265,7 +264,6 @@

\ D17F0 Bus Control and Power Management
    h# 88d2 config-setup  al lods  al dx out  \ SMBUS clock divisor
-   h# 8897 config-setup  al lods  al dx out  \ GPIO2/3 rather than MSDT/MSCK

\ D17F7 South-North Module Interface Control
    h# 8f0d config-setup  al lods  al dx out  \ Latency timer