[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 8/8] hw/arm/fsl-imx7: Connect watchdog interrupts
From: |
Guenter Roeck |
Subject: |
[PATCH 8/8] hw/arm/fsl-imx7: Connect watchdog interrupts |
Date: |
Sat, 14 Mar 2020 10:27:36 -0700 |
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 <address@hidden>
---
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
- [PATCH 2/8] hw/watchdog: Implement full i.MX watchdog support, (continued)
- [PATCH 2/8] hw/watchdog: Implement full i.MX watchdog support, Guenter Roeck, 2020/03/14
- [PATCH 3/8] hw/arm/fsl-imx25: Wire up watchdog, Guenter Roeck, 2020/03/14
- [PATCH 4/8] hw/arm/fsl-imx31: Wire up watchdog, Guenter Roeck, 2020/03/14
- [PATCH 5/8] hw/arm/fsl-imx6: Connect watchdog interrupts, Guenter Roeck, 2020/03/14
- [PATCH 7/8] hw/arm/fsl-imx7: Instantiate various unimplemented devices, Guenter Roeck, 2020/03/14
- [PATCH 6/8] hw/arm/fsl-imx6ul: Connect watchdog interrupts, Guenter Roeck, 2020/03/14
- [PATCH 8/8] hw/arm/fsl-imx7: Connect watchdog interrupts,
Guenter Roeck <=