Re: [PATCH v2 1/3] ARM: dts: armada-38x: add interrupts for watchdog

[Gregory CLEMENT]

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 
> ---
> 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 = < 2>, <>;
>   clock-names = "nbclk", "fixed";
> + interrupts-extended = < GIC_SPI 64 
> IRQ_TYPE_LEVEL_HIGH>,
> +   < GIC_SPI  9 
> IRQ_TYPE_LEVEL_HIGH>;
>   };
>  
>   cpurst: cpurst@20800 {
> -- 
> 2.21.0
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

Re: [PATCH v2 1/3] ARM: dts: armada-38x: add interrupts for watchdog

[Guenter Roeck]

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 
> ---
> 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 = < 2>, <>;
>   clock-names = "nbclk", "fixed";
> + interrupts-extended = < GIC_SPI 64 
> IRQ_TYPE_LEVEL_HIGH>,
> +   < 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

[PATCH v2 1/3] ARM: dts: armada-38x: add interrupts for watchdog

[Chris Packham]

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 
---
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 = < 2>, <>;
clock-names = "nbclk", "fixed";
+   interrupts-extended = < GIC_SPI 64 
IRQ_TYPE_LEVEL_HIGH>,
+ < GIC_SPI  9 
IRQ_TYPE_LEVEL_HIGH>;
};
 
cpurst: cpurst@20800 {
-- 
2.21.0