[PATCH v2 0/2] watchdog: at91sam9_wdt: add device tree support

[PATCH v2 0/2] watchdog: at91sam9_wdt: add device tree support

[Fabio Porcedda]

Hi all,

This set of patches is for adding device tree support to the
at91sam_wdt driver and the at91sam9260 soc.

I've tested it on an at91sam9260 board (evk-pro3).

Changes:
v2:
 - add missing to and cc addresses

Fabio Porcedda (2):
  watchdog: at91sam9_wdt: add device tree support
  ARM: at91: add at91sam9_wdt driver to at91sam9260

 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++
 arch/arm/boot/dts/at91sam9260.dtsi                       |  6 ++++++
 drivers/watchdog/at91sam9_wdt.c                          | 11 +++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

-- 
1.7.11.3

[PATCH v2 1/2] watchdog: at91sam9_wdt: add device tree support

[Fabio Porcedda]

Tested on an at91sam9260 board (evk-pro3)

Signed-off-by: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++
 drivers/watchdog/at91sam9_wdt.c                          | 11 +++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt

diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
new file mode 100644
index 0000000..fca76fd
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
@@ -0,0 +1,15 @@
+* Atmel Watchdog Timers
+
+** at91sam9-wdt
+
+Required properties:
+- compatible: must be "atmel,at91sam9-wdt"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+
+Example:
+
+	watchdog@fffffd40 {
+		compatible = "atmel,at91sam9-wdt";
+		reg = <0xfffffd40 0x10>;
+	};
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 05e1be8..c1ba2ed 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -32,6 +32,7 @@
 #include <linux/timer.h>
 #include <linux/bitops.h>
 #include <linux/uaccess.h>
+#include <linux/of.h>
 
 #include "at91sam9_wdt.h"
 
@@ -302,11 +303,21 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
 	return res;
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id at91_wdt_dt_ids[] = {
+	{ .compatible = "atmel,at91sam9-wdt" },
+	{ /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
+#endif
+
 static struct platform_driver at91wdt_driver = {
 	.remove		= __exit_p(at91wdt_remove),
 	.driver		= {
 		.name	= "at91_wdt",
 		.owner	= THIS_MODULE,
+		.of_match_table = of_match_ptr(at91_wdt_dt_ids),
 	},
 };
 
-- 
1.7.11.3

[PATCH v2 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260

[Fabio Porcedda]

Tested on an at91sam9260 board (evk-pro3)

Signed-off-by: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 66389c1..680b1c8 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -233,6 +233,12 @@
 					trigger-external;
 				};
 			};
+
+			watchdog@fffffd40 {
+				compatible = "atmel,at91sam9-wdt";
+				reg = <0xfffffd40 0x10>;
+			};
+
 		};
 
 		nand0: nand@40000000 {
-- 
1.7.11.3

Re: [PATCH v2 1/2] watchdog: at91sam9_wdt: add device tree support

[Jean-Christophe PLAGNIOL-VILLARD]

On 13:57 Wed 19 Sep     , Fabio Porcedda wrote:
> Tested on an at91sam9260 board (evk-pro3)
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++
>  drivers/watchdog/at91sam9_wdt.c                          | 11 +++++++++++
>  2 files changed, 26 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
> 
> diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
> new file mode 100644
> index 0000000..fca76fd
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
> @@ -0,0 +1,15 @@
> +* Atmel Watchdog Timers
> +
> +** at91sam9-wdt
> +
> +Required properties:
> +- compatible: must be "atmel,at91sam9-wdt"
atmel,at91sam9260-watchdog
> +- reg: physical base address of the controller and length of memory mapped
> +  region.
> +
> +Example:
> +
> +	watchdog@fffffd40 {
> +		compatible = "atmel,at91sam9-wdt";
> +		reg = <0xfffffd40 0x10>;
> +	};

you need to be able to specify the timeout too via DT

Best Regards,
J.

Re: [PATCH v2 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260

[Jean-Christophe PLAGNIOL-VILLARD]

On 13:57 Wed 19 Sep     , Fabio Porcedda wrote:
> Tested on an at91sam9260 board (evk-pro3)
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> ---
>  arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
> index 66389c1..680b1c8 100644
> --- a/arch/arm/boot/dts/at91sam9260.dtsi
> +++ b/arch/arm/boot/dts/at91sam9260.dtsi
> @@ -233,6 +233,12 @@
>  					trigger-external;
>  				};
>  			};
> +
> +			watchdog@fffffd40 {
disable dy default
> +				compatible = "atmel,at91sam9-wdt";
> +				reg = <0xfffffd40 0x10>;
> +			};
> +

Best Regards,
J.

Re: [PATCH v2 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260

[Fabio Porcedda]

Hi Jean-Christophe,

On Thu, Sep 20, 2012 at 7:29 AM, Jean-Christophe PLAGNIOL-VILLARD
<plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> wrote:
> On 13:57 Wed 19 Sep     , Fabio Porcedda wrote:
>> Tested on an at91sam9260 board (evk-pro3)
>>
>> Signed-off-by: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>>  arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++
>>  1 file changed, 6 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
>> index 66389c1..680b1c8 100644
>> --- a/arch/arm/boot/dts/at91sam9260.dtsi
>> +++ b/arch/arm/boot/dts/at91sam9260.dtsi
>> @@ -233,6 +233,12 @@
>>                                       trigger-external;
>>                               };
>>                       };
>> +
>> +                     watchdog@fffffd40 {
> disable dy default

All the others watchdog drivers in arch/arm/boot/dts/* are enabled by default.
IMHO the watchdog driver it's like the "rtstc" and "shdwc" driver,
they are safe to be enabled by default.
I'm missing something?

>> +                             compatible = "atmel,at91sam9-wdt";
>> +                             reg = <0xfffffd40 0x10>;
>> +                     };
>> +
>
> Best Regards,
> J.

Thanks for the review
-- 
Fabio Porcedda

Re: [PATCH v2 1/2] watchdog: at91sam9_wdt: add device tree support

[Fabio Porcedda]

On Thu, Sep 20, 2012 at 7:28 AM, Jean-Christophe PLAGNIOL-VILLARD
<plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> wrote:
> On 13:57 Wed 19 Sep     , Fabio Porcedda wrote:
>> Tested on an at91sam9260 board (evk-pro3)
>>
>> Signed-off-by: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>>  Documentation/devicetree/bindings/watchdog/atmel-wdt.txt | 15 +++++++++++++++
>>  drivers/watchdog/at91sam9_wdt.c                          | 11 +++++++++++
>>  2 files changed, 26 insertions(+)
>>  create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
>>
>> diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
>> new file mode 100644
>> index 0000000..fca76fd
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
>> @@ -0,0 +1,15 @@
>> +* Atmel Watchdog Timers
>> +
>> +** at91sam9-wdt
>> +
>> +Required properties:
>> +- compatible: must be "atmel,at91sam9-wdt"
> atmel,at91sam9260-watchdog
>> +- reg: physical base address of the controller and length of memory mapped
>> +  region.
>> +
>> +Example:
>> +
>> +     watchdog@fffffd40 {
>> +             compatible = "atmel,at91sam9-wdt";
>> +             reg = <0xfffffd40 0x10>;
>> +     };
>
> you need to be able to specify the timeout too via DT

Ok, i will send an updated patch.

Thanks for the review
-- 
Fabio Porcedda

Re: [PATCH v2 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260

[Jean-Christophe PLAGNIOL-VILLARD]

On 09:52 Thu 20 Sep     , Fabio Porcedda wrote:
> Hi Jean-Christophe,
> 
> On Thu, Sep 20, 2012 at 7:29 AM, Jean-Christophe PLAGNIOL-VILLARD
> <plagnioj@jcrosoft.com> wrote:
> > On 13:57 Wed 19 Sep     , Fabio Porcedda wrote:
> >> Tested on an at91sam9260 board (evk-pro3)
> >>
> >> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> >> ---
> >>  arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++
> >>  1 file changed, 6 insertions(+)
> >>
> >> diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
> >> index 66389c1..680b1c8 100644
> >> --- a/arch/arm/boot/dts/at91sam9260.dtsi
> >> +++ b/arch/arm/boot/dts/at91sam9260.dtsi
> >> @@ -233,6 +233,12 @@
> >>                                       trigger-external;
> >>                               };
> >>                       };
> >> +
> >> +                     watchdog@fffffd40 {
> > disable dy default
> 
> All the others watchdog drivers in arch/arm/boot/dts/* are enabled by default.
> IMHO the watchdog driver it's like the "rtstc" and "shdwc" driver,
> they are safe to be enabled by default.
> I'm missing something?
no the other watchdog will not reset if not managed

this one will

so I'm not confortable by enabling it by default

Best Regards,
J.

Re: [PATCH v2 2/2] ARM: at91: add at91sam9_wdt driver to at91sam9260

[Fabio Porcedda]

On Thu, Sep 20, 2012 at 12:07 PM, Jean-Christophe PLAGNIOL-VILLARD
<plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> wrote:
> On 09:52 Thu 20 Sep     , Fabio Porcedda wrote:
>> Hi Jean-Christophe,
>>
>> On Thu, Sep 20, 2012 at 7:29 AM, Jean-Christophe PLAGNIOL-VILLARD
>> <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> wrote:
>> > On 13:57 Wed 19 Sep     , Fabio Porcedda wrote:
>> >> Tested on an at91sam9260 board (evk-pro3)
>> >>
>> >> Signed-off-by: Fabio Porcedda <fabio.porcedda-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> >> ---
>> >>  arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++
>> >>  1 file changed, 6 insertions(+)
>> >>
>> >> diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
>> >> index 66389c1..680b1c8 100644
>> >> --- a/arch/arm/boot/dts/at91sam9260.dtsi
>> >> +++ b/arch/arm/boot/dts/at91sam9260.dtsi
>> >> @@ -233,6 +233,12 @@
>> >>                                       trigger-external;
>> >>                               };
>> >>                       };
>> >> +
>> >> +                     watchdog@fffffd40 {
>> > disable dy default
>>
>> All the others watchdog drivers in arch/arm/boot/dts/* are enabled by default.
>> IMHO the watchdog driver it's like the "rtstc" and "shdwc" driver,
>> they are safe to be enabled by default.
>> I'm missing something?
> no the other watchdog will not reset if not managed
>
> this one will
>
> so I'm not confortable by enabling it by default

Ok, i will send an updated patch.

Thanks for the review
-- 
Fabio Porcedda