Messages in this thread | | | From | Gregory CLEMENT <> | Subject | Re: [PATCH 1/2] ARM: dts: armada-xp: add interrupts for watchdog | Date | Mon, 28 Nov 2022 00:42:01 +0100 |
| |
Chris Packham <Chris.Packham@alliedtelesis.co.nz> writes:
> Hi Gregory, > > On 15/02/22 04:39, Gregory CLEMENT wrote: >> Hello 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> >> Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com> >> >> To keep bisectability this patch should be merged after the driver >> patch. >> >> Thanks, >> >> Gregory > > The driver changes were merged a while back. Looks like your intention > was for this to go in via the watchdog tree but that never happened. > Could you take it through your tree now? Probably won't be until 6.2 now > but that's fine.
Applied on mvebu/dt64
Thanks and sorry for having missing the fact that it was not applied.
Gregory
> >> >>> --- >>> arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 1 + >>> arch/arm/boot/dts/armada-xp.dtsi | 1 + >>> 2 files changed, 2 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi >>> index 38a052a0312d..0e561dfc0ca9 100644 >>> --- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi >>> +++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi >>> @@ -286,6 +286,7 @@ &watchdog { >>> compatible = "marvell,armada-xp-wdt"; >>> clocks = <&coreclk 2>, <&refclk>; >>> clock-names = "nbclk", "fixed"; >>> + interrupts = <93>, <38>; >>> }; >>> >>> &cpurst { >>> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi >>> index 6c19984d668e..4297482da62f 100644 >>> --- a/arch/arm/boot/dts/armada-xp.dtsi >>> +++ b/arch/arm/boot/dts/armada-xp.dtsi >>> @@ -260,6 +260,7 @@ &watchdog { >>> compatible = "marvell,armada-xp-wdt"; >>> clocks = <&coreclk 2>, <&refclk>; >>> clock-names = "nbclk", "fixed"; >>> + interrupts = <93>, <38>; >>> }; >>> >>> &cpurst { >>> -- >>> 2.35.1 >>>
-- Gregory Clement, Bootlin Embedded Linux and Kernel engineering http://bootlin.com
| |