diff options
| author | Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> | 2012-06-13 14:46:50 +1000 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2012-06-15 13:08:13 +0200 |
| commit | d85ba787c517308b8a463599ffc3e7e89c3dfbf2 (patch) | |
| tree | 3a504db2234c291a163e9617c8363aac9371dd3e | |
| parent | 07f9fd4864900349d0b3adb2c8403450bade21b7 (diff) | |
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 <peter.crosthwaite@petalogix.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
| -rw-r--r-- | hw/xilinx.h | 4 | ||||
| -rw-r--r-- | 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"); |