[commit] r3356 - in cpu/arm: mmp2 olpc

[repository service]

Author: wmb
Date: Wed Oct 10 21:20:29 2012
New Revision: 3356
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3356

Log:
OLPC ARM - add DMA mux to IRQ device tree nodes and refer to it in the audio driver.

Modified:
   cpu/arm/mmp2/irq.fth
   cpu/arm/olpc/sound.fth

Modified: cpu/arm/mmp2/irq.fth
==============================================================================
--- cpu/arm/mmp2/irq.fth	Wed Oct 10 08:12:31 2012	(r3355)
+++ cpu/arm/mmp2/irq.fth	Wed Oct 10 21:20:29 2012	(r3356)
@@ -95,6 +95,7 @@
    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]
+   h# 128 h# 11c d# 48 d# 24 make-mux-node \ DMA mux - 16 PDMA, 4 ADMA, 2 VDMA channels

0 [if]
 new-device

Modified: cpu/arm/olpc/sound.fth
==============================================================================
--- cpu/arm/olpc/sound.fth	Wed Oct 10 08:12:31 2012	(r3355)
+++ cpu/arm/olpc/sound.fth	Wed Oct 10 21:20:29 2012	(r3356)
@@ -39,6 +39,10 @@
    h# 900 +audio  h# 100 reg
    5 encode-int 4 encode-int encode+ " mmp-mav-dma-channels" property
    " marvell,mmp-audio-dma" +compatible
+
+   " /interrupt-controller@128" encode-phandle  " interrupt-parent" property
+   d# 20 encode-int  d# 21 encode-int encode+  " interrupts" property
+
    " disabled" " status" string-property
    current-device  ( adma1-ph )
 finish-device
@@ -61,6 +65,10 @@
    h# 800 +audio  h# 100 reg
    3 encode-int 2 encode-int encode+ " mmp-mav-dma-channels" property
    " marvell,mmp-audio-dma" +compatible
+
+   " /interrupt-controller@128" encode-phandle  " interrupt-parent" property
+   d# 18 encode-int  d# 19 encode-int encode+  " interrupts" property
+
    current-device  ( adma0-ph )
 finish-device