summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2011-09-16 00:48:34 +0200
committerMichael Walle <michael@walle.cc>2011-10-03 12:44:22 +0200
commit779277cab4ab748dea3dfc8c8e035c7a40523e1b (patch)
treec083c6ea26d26cb6dcb79f7f3e9837dbb1038c2f
parentfcfa339778a624dd67bb2def664ec6aabb497ba8 (diff)
downloadfocaccia-qemu-779277cab4ab748dea3dfc8c8e035c7a40523e1b.tar.gz
focaccia-qemu-779277cab4ab748dea3dfc8c8e035c7a40523e1b.zip
milkymist: new interrupt map
Due to the new uart core version the interrupt mapping has changed.

Signed-off-by: Michael Walle <michael@walle.cc>
-rw-r--r--hw/milkymist.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/milkymist.c b/hw/milkymist.c
index 6d99260b20..b7a8c1c256 100644
--- a/hw/milkymist.c
+++ b/hw/milkymist.c
@@ -147,16 +147,16 @@ milkymist_init(ram_addr_t ram_size_not_used,
     }
 
     milkymist_uart_create(0x60000000, irq[0]);
-    milkymist_sysctl_create(0x60001000, irq[2], irq[3], irq[4],
+    milkymist_sysctl_create(0x60001000, irq[1], irq[2], irq[3],
             80000000, 0x10014d31, 0x0000041f, 0x00000001);
     milkymist_hpdmc_create(0x60002000);
     milkymist_vgafb_create(0x60003000, 0x40000000, 0x0fffffff);
     milkymist_memcard_create(0x60004000);
-    milkymist_ac97_create(0x60005000, irq[5], irq[6], irq[7], irq[8]);
-    milkymist_pfpu_create(0x60006000, irq[9]);
-    milkymist_tmu2_create(0x60007000, irq[10]);
-    milkymist_minimac2_create(0x60008000, 0x30000000, irq[11], irq[12]);
-    milkymist_softusb_create(0x6000f000, irq[17],
+    milkymist_ac97_create(0x60005000, irq[4], irq[5], irq[6], irq[7]);
+    milkymist_pfpu_create(0x60006000, irq[8]);
+    milkymist_tmu2_create(0x60007000, irq[9]);
+    milkymist_minimac2_create(0x60008000, 0x30000000, irq[10], irq[11]);
+    milkymist_softusb_create(0x6000f000, irq[15],
             0x20000000, 0x1000, 0x20020000, 0x2000);
 
     /* make sure juart isn't the first chardev */