aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-09-14 18:43:19 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-09-14 18:43:19 +0100
commitce3bc112cdb1d462e2d52eaa17a7314e7f3af504 (patch)
treee956f9c4bd71330f186a36847460999882a6c651
parentd464814ae729f3200234ff74d5f050ddad4f1f20 (diff)
downloadqemu-arm-pull-target-arm-20170914.tar.gz
mps2-an511: Fix wiring of UART overflow interrupt linespull-target-arm-20170914
Fix an error that meant we were wiring every UART's overflow interrupts into the same inputs 0 and 1 of the OR gate, rather than giving each its own input. Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Message-id: 1505232834-20890-1-git-send-email-peter.maydell@linaro.org
-rw-r--r--hw/arm/mps2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index abb0ab6d71..769cff872c 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -287,8 +287,8 @@ static void mps2_common_init(MachineState *machine)
cmsdk_apb_uart_create(uartbase[i],
qdev_get_gpio_in(txrx_orgate_dev, 0),
qdev_get_gpio_in(txrx_orgate_dev, 1),
- qdev_get_gpio_in(orgate_dev, 0),
- qdev_get_gpio_in(orgate_dev, 1),
+ qdev_get_gpio_in(orgate_dev, i * 2),
+ qdev_get_gpio_in(orgate_dev, i * 2 + 1),
NULL,
uartchr, SYSCLK_FRQ);
}