[PATCH v2] ARM: socfpga: dts: add watchdog0+1

[PATCH v2] ARM: socfpga: dts: add watchdog0+1

[Steffen Trumtrar]

The SoCFPGA has two watchdog timers. Add them to the dtsi.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
 arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 56fc214..7bcd458 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -549,6 +549,22 @@
 			reg = <0xffd05000 0x1000>;
 		};
 
+		watchdog0: watchdog at ffd02000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd02000 0x1000>;
+			interrupts = <0 171 0>;
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
+		watchdog1: watchdog at ffd03000 {
+			compatible = "snps,dw-wdt";
+			reg = <0xffd03000 0x1000>;
+			interrupts = <0 172 0>;
+			clocks = <&osc1>;
+			status = "disabled";
+		};
+
 		sysmgr: sysmgr at ffd08000 {
 			compatible = "altr,sys-mgr", "syscon";
 			reg = <0xffd08000 0x4000>;
-- 
2.0.0.rc0

[PATCH v2] ARM: socfpga: dts: add watchdog0+1

[Dinh Nguyen]

Hi Steffen,

On 5/22/14 8:06 AM, Steffen Trumtrar wrote:
> The SoCFPGA has two watchdog timers. Add them to the dtsi.
>
> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> ---
>  arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>
> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
> index 56fc214..7bcd458 100644
> --- a/arch/arm/boot/dts/socfpga.dtsi
> +++ b/arch/arm/boot/dts/socfpga.dtsi
> @@ -549,6 +549,22 @@
>  			reg = <0xffd05000 0x1000>;
>  		};
>  
> +		watchdog0: watchdog at ffd02000 {
> +			compatible = "snps,dw-wdt";
> +			reg = <0xffd02000 0x1000>;
> +			interrupts = <0 171 0>;
This should be IRQ_TYPE_LEVEL_HIGH.
> +			clocks = <&osc1>;
> +			status = "disabled";
> +		};
> +
> +		watchdog1: watchdog at ffd03000 {
> +			compatible = "snps,dw-wdt";
> +			reg = <0xffd03000 0x1000>;
> +			interrupts = <0 172 0>;
Same here..
> +			clocks = <&osc1>;
> +			status = "disabled";
> +		};
> +
>  		sysmgr: sysmgr at ffd08000 {
>  			compatible = "altr,sys-mgr", "syscon";
>  			reg = <0xffd08000 0x4000>;
No need to resend a patch, I'll apply with those changes.

Dinh

[PATCH v2] ARM: socfpga: dts: add watchdog0+1

[Steffen Trumtrar]

Hi Dinh!

On Thu, May 22, 2014 at 09:35:19AM -0500, Dinh Nguyen wrote:
> Hi Steffen,
> 
> On 5/22/14 8:06 AM, Steffen Trumtrar wrote:
> > The SoCFPGA has two watchdog timers. Add them to the dtsi.
> >
> > Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> > ---
> >  arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
> >  1 file changed, 16 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
> > index 56fc214..7bcd458 100644
> > --- a/arch/arm/boot/dts/socfpga.dtsi
> > +++ b/arch/arm/boot/dts/socfpga.dtsi
> > @@ -549,6 +549,22 @@
> >  			reg = <0xffd05000 0x1000>;
> >  		};
> >  
> > +		watchdog0: watchdog at ffd02000 {
> > +			compatible = "snps,dw-wdt";
> > +			reg = <0xffd02000 0x1000>;
> > +			interrupts = <0 171 0>;
> This should be IRQ_TYPE_LEVEL_HIGH.
> > +			clocks = <&osc1>;
> > +			status = "disabled";
> > +		};
> > +
> > +		watchdog1: watchdog at ffd03000 {
> > +			compatible = "snps,dw-wdt";
> > +			reg = <0xffd03000 0x1000>;
> > +			interrupts = <0 172 0>;
> Same here..
> > +			clocks = <&osc1>;
> > +			status = "disabled";
> > +		};
> > +
> >  		sysmgr: sysmgr at ffd08000 {
> >  			compatible = "altr,sys-mgr", "syscon";
> >  			reg = <0xffd08000 0x4000>;

I wasn't aware that we started using the IRQ defines, but...

> No need to resend a patch, I'll apply with those changes.
>

...great. Thanks.

Steffen

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

[PATCH v2] ARM: socfpga: dts: add watchdog0+1

[Dinh Nguyen]

On 5/22/14 9:39 AM, Steffen Trumtrar wrote:
> Hi Dinh!
>
> On Thu, May 22, 2014 at 09:35:19AM -0500, Dinh Nguyen wrote:
>> Hi Steffen,
>>
>> On 5/22/14 8:06 AM, Steffen Trumtrar wrote:
>>> The SoCFPGA has two watchdog timers. Add them to the dtsi.
>>>
>>> Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
>>> ---
>>>  arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++++++++++
>>>  1 file changed, 16 insertions(+)
>>>
>>> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
>>> index 56fc214..7bcd458 100644
>>> --- a/arch/arm/boot/dts/socfpga.dtsi
>>> +++ b/arch/arm/boot/dts/socfpga.dtsi
>>> @@ -549,6 +549,22 @@
>>>  			reg = <0xffd05000 0x1000>;
>>>  		};
>>>  
>>> +		watchdog0: watchdog at ffd02000 {
>>> +			compatible = "snps,dw-wdt";
>>> +			reg = <0xffd02000 0x1000>;
>>> +			interrupts = <0 171 0>;
>> This should be IRQ_TYPE_LEVEL_HIGH.
>>> +			clocks = <&osc1>;
>>> +			status = "disabled";
>>> +		};
>>> +
>>> +		watchdog1: watchdog at ffd03000 {
>>> +			compatible = "snps,dw-wdt";
>>> +			reg = <0xffd03000 0x1000>;
>>> +			interrupts = <0 172 0>;
>> Same here..
>>> +			clocks = <&osc1>;
>>> +			status = "disabled";
>>> +		};
>>> +
>>>  		sysmgr: sysmgr at ffd08000 {
>>>  			compatible = "altr,sys-mgr", "syscon";
>>>  			reg = <0xffd08000 0x4000>;
> I wasn't aware that we started using the IRQ defines, but...
You added the support to be able to do that ;). But what I really meant was
you had the IRQ type set to 0(IRQ_TYPE_NONE), but it should be 4.

Dinh
>
>> No need to resend a patch, I'll apply with those changes.
>>
> ...great. Thanks.
>
> Steffen
>