diff mbox series

[1/2] ARM: dts: armada-xp: add interrupts for watchdog

Message ID 20220211003257.2037332-2-chris.packham@alliedtelesis.co.nz (mailing list archive)
State Handled Elsewhere
Headers show
Series watchdog: Pretimeout support for Armada-XP | expand

Commit Message

Chris Packham Feb. 11, 2022, 12:32 a.m. UTC
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>
---
 arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 1 +
 arch/arm/boot/dts/armada-xp.dtsi          | 1 +
 2 files changed, 2 insertions(+)

Comments

Gregory CLEMENT Feb. 14, 2022, 3:39 p.m. UTC | #1
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

> ---
>  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
>
Guenter Roeck Feb. 14, 2022, 3:58 p.m. UTC | #2
On Fri, Feb 11, 2022 at 01:32:56PM +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>
> Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  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 {
Chris Packham Oct. 16, 2022, 10:39 p.m. UTC | #3
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.

>
>> ---
>>   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
>>
Guenter Roeck Oct. 17, 2022, 12:20 a.m. UTC | #4
On 10/16/22 15:39, Chris Packham wrote:
> 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.
> 

We don't take any actual devicetree changes. Those need to be pushed through
architecture/platform trees. Anything else would create never ending conflicts
(and I strongly suspect that various maintainers would complain).

Guenter
Gregory CLEMENT Nov. 27, 2022, 11:42 p.m. UTC | #5
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
>>>
diff mbox series

Patch

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 {