From d85ba787c517308b8a463599ffc3e7e89c3dfbf2 Mon Sep 17 00:00:00 2001 From: "Peter A. G. Crosthwaite" Date: Wed, 13 Jun 2012 14:46:50 +1000 Subject: [PATCH] xilinx_axidma: (un)reversed irq initialisation The axidma irq orders are reversed in both the device model and the instantion. Undid both reversal (for no net change). Also needs to be reversed for consistency with Xilinx tools IRQ listing. Signed-off-by: Peter A. G. Crosthwaite Signed-off-by: Edgar E. Iglesias --- hw/xilinx.h | 4 ++-- hw/xilinx_axidma.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 35f35bd7fc..70d15cfcf9 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -81,8 +81,8 @@ xilinx_axiethernetdma_create(void *dmach, qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); - sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq2); - sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq); + sysbus_connect_irq(sysbus_from_qdev(dev), 0, irq); + sysbus_connect_irq(sysbus_from_qdev(dev), 1, irq2); return dev; } diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c index 85dfcbf2b9..59373b51d9 100644 --- a/hw/xilinx_axidma.c +++ b/hw/xilinx_axidma.c @@ -463,8 +463,8 @@ static int xilinx_axidma_init(SysBusDevice *dev) struct XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), dev); int i; - sysbus_init_irq(dev, &s->streams[1].irq); sysbus_init_irq(dev, &s->streams[0].irq); + sysbus_init_irq(dev, &s->streams[1].irq); if (!s->dmach) { hw_error("Unconnected DMA channel.\n");