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>,
	qemu-devel@nongnu.org,
	Jean-Christophe Dubois <jcd@tribudubois.net>,
	qemu-arm@nongnu.org, Peter Chubb <peter.chubb@nicta.com.au>,
	Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH 8/8] hw/arm/fsl-imx7: Connect watchdog interrupts
Date: Sat, 14 Mar 2020 10:27:36 -0700	[thread overview]
Message-ID: <20200314172736.24528-9-linux@roeck-us.net> (raw)
In-Reply-To: <20200314172736.24528-1-linux@roeck-us.net>

i.MX7 supports watchdog pretimeout interupts. With this commit,
the watchdog in mcimx7d-sabre is fully operational, including
pretimeout support.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 hw/arm/fsl-imx7.c         | 11 +++++++++++
 include/hw/arm/fsl-imx7.h |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c
index 29382776b2..6c539c8b23 100644
--- a/hw/arm/fsl-imx7.c
+++ b/hw/arm/fsl-imx7.c
@@ -447,11 +447,22 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp)
             FSL_IMX7_WDOG3_ADDR,
             FSL_IMX7_WDOG4_ADDR,
         };
+        static const int FSL_IMX7_WDOGn_IRQ[FSL_IMX7_NUM_WDTS] = {
+            FSL_IMX7_WDOG1_IRQ,
+            FSL_IMX7_WDOG2_IRQ,
+            FSL_IMX7_WDOG3_IRQ,
+            FSL_IMX7_WDOG4_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_IMX7_WDOGn_ADDR[i]);
+        sysbus_connect_irq(SYS_BUS_DEVICE(&s->wdt[i]), 0,
+                           qdev_get_gpio_in(DEVICE(&s->a7mpcore),
+                                            FSL_IMX7_WDOGn_IRQ[i]));
     }
 
     /*
diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h
index 47826da2b7..da977f9ffb 100644
--- a/include/hw/arm/fsl-imx7.h
+++ b/include/hw/arm/fsl-imx7.h
@@ -228,6 +228,11 @@ enum FslIMX7IRQs {
     FSL_IMX7_USB2_IRQ     = 42,
     FSL_IMX7_USB3_IRQ     = 40,
 
+    FSL_IMX7_WDOG1_IRQ    = 78,
+    FSL_IMX7_WDOG2_IRQ    = 79,
+    FSL_IMX7_WDOG3_IRQ    = 10,
+    FSL_IMX7_WDOG4_IRQ    = 109,
+
     FSL_IMX7_PCI_INTA_IRQ = 125,
     FSL_IMX7_PCI_INTB_IRQ = 124,
     FSL_IMX7_PCI_INTC_IRQ = 123,
-- 
2.17.1



      parent reply	other threads:[~2020-03-14 17:30 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-14 17:27 [PATCH 0/8] hw/arm: Implement i.MX watchdog support Guenter Roeck
2020-03-14 17:27 ` [PATCH 1/8] hw: Move i.MX watchdog driver to hw/watchdog Guenter Roeck
2020-03-14 21:43   ` Philippe Mathieu-Daudé
2020-03-14 21:46     ` Philippe Mathieu-Daudé
2020-03-14 22:11       ` Guenter Roeck
2020-03-14 17:27 ` [PATCH 2/8] hw/watchdog: Implement full i.MX watchdog support Guenter Roeck
2020-03-14 17:27 ` [PATCH 3/8] hw/arm/fsl-imx25: Wire up watchdog Guenter Roeck
2020-03-14 21:48   ` Philippe Mathieu-Daudé
2020-03-14 22:12     ` Guenter Roeck
2020-03-14 17:27 ` [PATCH 4/8] hw/arm/fsl-imx31: " Guenter Roeck
2020-03-14 21:50   ` Philippe Mathieu-Daudé
2020-03-14 22:12     ` Guenter Roeck
2020-03-14 17:27 ` [PATCH 5/8] hw/arm/fsl-imx6: Connect watchdog interrupts Guenter Roeck
2020-03-14 17:27 ` [PATCH 6/8] hw/arm/fsl-imx6ul: " Guenter Roeck
2020-03-14 17:27 ` [PATCH 7/8] hw/arm/fsl-imx7: Instantiate various unimplemented devices Guenter Roeck
2020-03-14 17:27 ` Guenter Roeck [this message]

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=20200314172736.24528-9-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-arm@nongnu.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).