From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 27 Jul 2018 11:38:54 +0000 (+0100)
Subject: hw/arm/iotkit: Fix IRQ number for timer1
X-Git-Tag: qemu-xen-4.12.0-rc1~23^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=984b0c100f74eb4a32b3d44eb80963ee82ebfba5;p=qemu-xen.git

hw/arm/iotkit: Fix IRQ number for timer1

A cut-and-paste error meant we were incorrectly wiring up the timer1
IRQ to IRQ3. IRQ3 is the interrupt for timer0 -- move timer0 to
IRQ4 where it belongs.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180727113854.20283-3-peter.maydell@linaro.org
---

diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c
index c76d3ed743..8cadc8b160 100644
--- a/hw/arm/iotkit.c
+++ b/hw/arm/iotkit.c
@@ -382,7 +382,7 @@ static void iotkit_realize(DeviceState *dev, Error **errp)
         return;
     }
     sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0,
-                       qdev_get_gpio_in(DEVICE(&s->armv7m), 3));
+                       qdev_get_gpio_in(DEVICE(&s->armv7m), 4));
     mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0);
     object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err);
     if (err) {