r376 - cpu/x86/pc/olpc

Author: wmb
Date: 2007-05-12 04:13:18 +0200 (Sat, 12 May 2007)
New Revision: 376

Modified:
   cpu/x86/pc/olpc/gpioinit.fth
   cpu/x86/pc/olpc/gxmsrs.fth
   cpu/x86/pc/olpc/lxmsrs.fth
Log:
OLPC - interrupt routing changes to support SCI power management events

Modified: cpu/x86/pc/olpc/gpioinit.fth
===================================================================
--- cpu/x86/pc/olpc/gpioinit.fth	2007-05-12 02:05:40 UTC (rev 375)
+++ cpu/x86/pc/olpc/gpioinit.fth	2007-05-12 02:13:18 UTC (rev 376)
@@ -98,13 +98,15 @@
 \  h#     0000 h# 10dc pw!  \ GPIO_07_EVENT_COUNT - default
 \  h#     0000 h# 10de pw!  \ GPIO_07_EVENTCOMPARE_VALUE - default

-   h# 20000001 h# 10e0 pl!  \ GPIO_MAPPER_X
 lx? if
-   h# 00500000 h# 10e4 pl!  \ GPIO_MAPPER_Y
+   h# 20000001 h# 10e0 pl!  \ GPIO_MAPPER_X - GPIO7(DCON) -> group 2 , GPIO0(CPU) -> group 1
+   h# 00500000 h# 10e4 pl!  \ GPIO_MAPPER_Y - GPIO13(CaFe) -> group 5
+else
+   h# 20000005 h# 10e0 pl!  \ GPIO_MAPPER_X - GPIO7(DCON) -> group 2, GPIO 0(CaFe) -> group 5
 then
 \  h# 00000000 h# 10e4 pl!  \ GPIO_MAPPER_Y - default
 \  h# 00000000 h# 10e8 pl!  \ GPIO_MAPPER_Z - default
-\  h# 00000000 h# 10ec pl!  \ GPIO_MAPPER_W - default
+   h# 0000fe00 h# 10ec pl!  \ GPIO_MAPPER_W - GPIO27 is SCI, PME+group 7, GPIO26 is PWR_BUT_in (lid), PME+group 6
 \  h#       00 h# 10f0 pc!  \ GPIO_EE_SELECT_0 - default
 \  h#       00 h# 10f1 pc!  \ GPIO_EE_SELECT_1 - default
 \  h#       00 h# 10f2 pc!  \ GPIO_EE_SELECT_2 - default

Modified: cpu/x86/pc/olpc/gxmsrs.fth
===================================================================
--- cpu/x86/pc/olpc/gxmsrs.fth	2007-05-12 02:05:40 UTC (rev 375)
+++ cpu/x86/pc/olpc/gxmsrs.fth	2007-05-12 02:13:18 UTC (rev 376)
@@ -281,16 +281,16 @@
 msr: 5140.001b 00000000.00100010. \ NANDF_DATA
 msr: 5140.001c 00000000.00000010. \ NANDF_CTL
 msr: 5140.001f 00000000.00000011. \ KEL_CTRL
-msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW
-msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH
-msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW
-msr: 5140.0023 00000000.600aa5b2. \ IRQM_ZHIGH
-msr: 5140.0025 00000000.00001002. \ IRQM_LPC
+msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW NAND distract, NAND ready, PM SCI OR, AC97, RTC Alarm, USB, -, SW IRQ
+msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH UART1
+msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW MFGPTs
+msr: 5140.0023 00000000.33b00600. \ IRQM_ZHIGH SCI-3, LID-3, CaFe-11, DCON-6
+msr: 5140.0025 00000000.00001002. \ IRQM_LPC Enable mouse(12) and kbd (1)
 \ msr: 5140.0028 00000000.000000ff. \ MFGPT_IRQ Leave this off
-msr: 5140.0040 00000000.00000000. \ DMA_MAP
+\ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default
 \ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ
 \ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ
-msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ
+msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ - Active high bit 12 (mouse) and 2 (kbd), Enable, Quiet, 17 frames

\ USB host controller
 msr: 5120.0001 0000000b.00000000.  \ USB_GLD_MSR_CONFIG - 5536 page 262

Modified: cpu/x86/pc/olpc/lxmsrs.fth
===================================================================
--- cpu/x86/pc/olpc/lxmsrs.fth	2007-05-12 02:05:40 UTC (rev 375)
+++ cpu/x86/pc/olpc/lxmsrs.fth	2007-05-12 02:13:18 UTC (rev 376)
@@ -231,11 +231,11 @@
 \ msr: 5140.001b 00000000.07770777.  \ NANDF_DATA - default
 \ msr: 5140.001c 00000000.00000777.  \ NANDF_CTL - default
   msr: 5140.001f 00000000.00000011.  \ KEL_CTRL
-  msr: 5140.0020 00000000.bb350a00.  \ IRQM_YLOW NAND distract, NAND ready, PM SCI OR, AC97, RTC Alarm, USB, -, SW IRQ
-  msr: 5140.0021 00000000.04000000.  \ IRQM_YHIGH xUART2, UART1, xKEL, SMB, -, -, -, -
-  msr: 5140.0022 00000000.00002222.  \ IRQM_ZLOW
-  msr: 5140.0023 00000000.60baa5e2.  \ IRQM_ZHIGH
-  msr: 5140.0025 00000000.00001002.  \ IRQM_LPC
+  msr: 5140.0020 00000000.00350a00.  \ IRQM_YLOW PM SCI OR, AC97, RTC Alarm, USB, -, SW IRQ
+  msr: 5140.0021 00000000.04000000.  \ IRQM_YHIGH UART1
+  msr: 5140.0022 00000000.00002222.  \ IRQM_ZLOW MFGPTs
+  msr: 5140.0023 00000000.33b006e0.  \ IRQM_ZHIGH SCI-3, LID-3, CaFe-11, DCON-6, CPU-14
+  msr: 5140.0025 00000000.00001002.  \ IRQM_LPC Enable mouse(12) and kbd (1)
 \ msr: 5140.0028 00000000.00000000.  \ MFGPT_IRQ off - default
 \ msr: 5140.0040 00000000.00000000.  \ DMA_MAP - default
 \ msr: 5140.004e 00000000.ef2500c0.  \ LPC_SIRQ