Commit c4947e64 authored by Guenter Roeck's avatar Guenter Roeck Committed by Peter Maydell
Browse files

hw/arm/fsl-imx7: Connect watchdog interrupts 



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

Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Message-id: 20200517162135.110364-9-linux@roeck-us.net
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 72465e1e

hw/arm/fsl-imx7.c

+11 −0
Original line number Diff line number Diff line
@@ -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]));

    }



    /*

include/hw/arm/fsl-imx7.h

+5 −0
Original line number Diff line number Diff line
@@ -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,