Changeset 3159

Timestamp:

Aug 13, 2012 10:27:29 PM (9 months ago)

Author:

wmb

Message:

OLPC ARM - Handle MMP3 IRQ differences.

File:

• cpu/arm/mmp2/irq.fth (modified) (1 diff)

cpu/arm/mmp2/irq.fth

@@ -71 +71 @@
 ;
 
-   h# 150 h# 168     4     2 make-mux-node \ intcmux4
-   h# 154 h# 16c     5     2 make-mux-node \ intcmux5
-   h# 180 h# 17c     9     3 make-mux-node \ intcmux9
-   h# 158 h# 170 d# 17     5 make-mux-node \ intcmux17
-   h# 15c h# 174 d# 35 d# 15 make-mux-node \ intcmux35
-   h# 160 h# 178 d# 51     2 make-mux-node \ intcmux51
-   h# 188 h# 184 d# 55     2 make-mux-node \ intcmux55
+[ifdef] mmp3
+   \ stat   mask
+   h# 150 h# 168     4     4 make-mux-node \ intcmux4 - USB_CHARGER, PMIC, SPMI, CHRG_DTC_OUT
+   h# 154 h# 16c     5     2 make-mux-node \ intcmux5 - RTC_ALARM, RTC
+   h# 1bc h# 1a4     6     3 make-mux-node \ intcmux6 - ETHERNET, res, HSI_INT_3
+   h# 1c0 h# 1a8     8     4 make-mux-node \ intcmux8 - GC2000, res, GC300, MOLTRES_NGIC_2
+
+   h# 158 h# 170 d# 17     5 make-mux-node \ intcmux17 - TWSI2,3,4,5,6
+   h# 1c4 h# 1ac d# 18     3 make-mux-node \ intcmux18 - Res, HSI_INT_2, MOLTRES_NGIC_1
+   h# 1c8 h# 1b0 d# 30     2 make-mux-node \ intcmux30 - ISP_DMA, DXO_ISP
+   h# 15c h# 174 d# 35 d# 31 make-mux-node \ intcmux35 - MOLTRES_(various)  (differens from MMP2)
+   h# 1cc h# 1bf d# 42     2 make-mux-node \ intcmux42 - CCIC2, CCIC1
+   h# 160 h# 178 d# 51     2 make-mux-node \ intcmux51 - SSP1_SRDY, SSP3_SRDY
+   h# 184 h# 17c d# 55     4 make-mux-node \ intcmux55 - MMC5, res, res, HSI_INT_1
+   h# 188 h# 188 d# 55 d# 20 make-mux-node \ intcmux57 - (various)
+   h# 1d0 h# 1b8 d# 58     5 make-mux-node \ intcmux58 - MSP_CARD, KERMIT_INT_0, KERMIT_INT_1, res, HSI_INT_0
+[else]
+   h# 150 h# 168     4     2 make-mux-node \ intcmux4 - USB_CHARGER, PMIC
+   h# 154 h# 16c     5     2 make-mux-node \ intcmux5 - RTC_ALARM, RTC
+   h# 180 h# 17c     9     3 make-mux-node \ intcmux9 - KPC, ROTARY, TBALL
+   h# 158 h# 170 d# 17     5 make-mux-node \ intcmux17 - TWSI2,3,4,5,6
+   h# 15c h# 174 d# 35 d# 15 make-mux-node \ intcmux35 - (various)
+   h# 160 h# 178 d# 51     2 make-mux-node \ intcmux51 - HSI_CAWAKE(1?), MIPI_HSI_INT1
+   h# 188 h# 184 d# 55     2 make-mux-node \ intcmux55 - HSA_CAWAKE(0?), MIPI_HSI_INT0
+[then]
 
 0 [if]