qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
	Peter Chubb <peter.chubb@nicta.com.au>,
	qemu-devel@nongnu.org, Guenter Roeck <linux@roeck-us.net>,
	Jean-Christophe Dubois <jcd@tribudubois.net>
Subject: [PATCH v3 5/8] hw/arm/fsl-imx6: Connect watchdog interrupts
Date: Sun, 17 May 2020 09:21:32 -0700	[thread overview]
Message-ID: <20200517162135.110364-6-linux@roeck-us.net> (raw)
In-Reply-To: <20200517162135.110364-1-linux@roeck-us.net>

With this patch applied, the watchdog in the sabrelite emulation
is fully operational, including pretimeout support.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v3: Added Philippe's Reviewed-by: tag
v2: No change

 hw/arm/fsl-imx6.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index 13f1bf23a6..f58c85aa8c 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -433,11 +433,20 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
             FSL_IMX6_WDOG1_ADDR,
             FSL_IMX6_WDOG2_ADDR,
         };
+        static const int FSL_IMX6_WDOGn_IRQ[FSL_IMX6_NUM_WDTS] = {
+            FSL_IMX6_WDOG1_IRQ,
+            FSL_IMX6_WDOG2_IRQ,
+        };
 
+        object_property_set_bool(OBJECT(&s->wdt[i]), true, "pretimeout-support",
+                                 &error_abort);
         object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized",
                                  &error_abort);
 
         sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0, FSL_IMX6_WDOGn_ADDR[i]);
+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->wdt[i]), 0,
+                           qdev_get_gpio_in(DEVICE(&s->a9mpcore),
+                                            FSL_IMX6_WDOGn_IRQ[i]));
     }
 
     /* ROM memory */
-- 
2.17.1



  parent reply	other threads:[~2020-05-17 16:24 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-17 16:21 [PATCH v3 0/8] hw/arm: Implement i.MX watchdog support Guenter Roeck
2020-05-17 16:21 ` [PATCH v3 1/8] hw: Move i.MX watchdog driver to hw/watchdog Guenter Roeck
2020-05-17 16:21 ` [PATCH v3 2/8] hw/watchdog: Implement full i.MX watchdog support Guenter Roeck
2020-05-21 21:04   ` Peter Maydell
2020-05-21 22:11     ` Guenter Roeck
2020-05-17 16:21 ` [PATCH v3 3/8] hw/arm/fsl-imx25: Wire up watchdog Guenter Roeck
2020-05-17 16:21 ` [PATCH v3 4/8] hw/arm/fsl-imx31: " Guenter Roeck
2020-05-17 16:21 ` Guenter Roeck [this message]
2020-05-17 16:21 ` [PATCH v3 6/8] hw/arm/fsl-imx6ul: Connect watchdog interrupts Guenter Roeck
2020-05-17 16:21 ` [PATCH v3 7/8] hw/arm/fsl-imx7: Instantiate various unimplemented devices Guenter Roeck
2020-05-17 16:21 ` [PATCH v3 8/8] hw/arm/fsl-imx7: Connect watchdog interrupts Guenter Roeck
2020-05-21 15:59 ` [PATCH v3 0/8] hw/arm: Implement i.MX watchdog support Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200517162135.110364-6-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=andrew.smirnov@gmail.com \
    --cc=jcd@tribudubois.net \
    --cc=peter.chubb@nicta.com.au \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).