Changeset 3356

Timestamp:

Oct 10, 2012 9:20:29 PM (7 months ago)

Author:

wmb

Message:

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

Location:

cpu/arm

Files:

• mmp2/irq.fth (modified) (1 diff)
• olpc/sound.fth (modified) (2 diffs)

cpu/arm/mmp2/irq.fth

@@ -96 +96 @@
    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]

cpu/arm/olpc/sound.fth

@@ -40 +40 @@
    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 )
@@ -62 +66 @@
    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