| Message ID | 20190305201924.14853-2-chris.packham@alliedtelesis.co.nz (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | watchdog: orion_wdt: add pretimeout support | expand |
On Wed, Mar 06, 2019 at 09:19:22AM +1300, Chris Packham wrote: > The first interrupt is for the regular watchdog timeout. Normally the > RSTOUT line will trigger a reset before this interrupt fires but on > systems with a non-standard reset it may still trigger. > > The second interrupt is for a timer1 which is used as a pre-timeout for > the watchdog. > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > Changes in v2: > - new, split out from "watchdog: orion_wdt: use timer1 as a pretimeout" > > arch/arm/boot/dts/armada-38x.dtsi | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi > index 929459c42760..fc550c640ca8 100644 > --- a/arch/arm/boot/dts/armada-38x.dtsi > +++ b/arch/arm/boot/dts/armada-38x.dtsi > @@ -376,6 +376,8 @@ > reg = <0x20300 0x34>, <0x20704 0x4>, <0x18260 0x4>; > clocks = <&coreclk 2>, <&refclk>; > clock-names = "nbclk", "fixed"; > + interrupts-extended = <&gic GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>, > + <&gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; This will need to be documented, possibly including the use of interrupts-extended (currently only interrupts is documented in Documentation/devicetree/bindings/watchdog/marvel.txt). Also, how would it be handled if the primary interrupt is not specified ? After all, it is optional. Thanks, Guenter
Hi Chris, > The first interrupt is for the regular watchdog timeout. Normally the > RSTOUT line will trigger a reset before this interrupt fires but on > systems with a non-standard reset it may still trigger. > > The second interrupt is for a timer1 which is used as a pre-timeout for > the watchdog. > > Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > Changes in v2: > - new, split out from "watchdog: orion_wdt: use timer1 as a pretimeout" > > arch/arm/boot/dts/armada-38x.dtsi | 2 ++ > 1 file changed, 2 insertions(+) > Applied on mvebu/dt Thanks, Gregory > diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi > index 929459c42760..fc550c640ca8 100644 > --- a/arch/arm/boot/dts/armada-38x.dtsi > +++ b/arch/arm/boot/dts/armada-38x.dtsi > @@ -376,6 +376,8 @@ > reg = <0x20300 0x34>, <0x20704 0x4>, <0x18260 0x4>; > clocks = <&coreclk 2>, <&refclk>; > clock-names = "nbclk", "fixed"; > + interrupts-extended = <&gic GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>, > + <&gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; > }; > > cpurst: cpurst@20800 { > -- > 2.21.0 >
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index 929459c42760..fc550c640ca8 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -376,6 +376,8 @@ reg = <0x20300 0x34>, <0x20704 0x4>, <0x18260 0x4>; clocks = <&coreclk 2>, <&refclk>; clock-names = "nbclk", "fixed"; + interrupts-extended = <&gic GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>, + <&gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; }; cpurst: cpurst@20800 {
The first interrupt is for the regular watchdog timeout. Normally the RSTOUT line will trigger a reset before this interrupt fires but on systems with a non-standard reset it may still trigger. The second interrupt is for a timer1 which is used as a pre-timeout for the watchdog. Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- Changes in v2: - new, split out from "watchdog: orion_wdt: use timer1 as a pretimeout" arch/arm/boot/dts/armada-38x.dtsi | 2 ++ 1 file changed, 2 insertions(+)