LinuxLists.cc - [PATCH 0/2] ARM: dts: add watchdog device tree node in at91 dts files

2013-05-31 03:09:50

Subject: [PATCH 0/2] ARM: dts: add watchdog device tree node in at91 dts files

Hello,

The patches is to add watchdog device tree node for at91 SoC and board dts files.

Since the watchdog is disabled in the at91bootstrap with default configuration,
if you want to use the watchdog in the kernel, you must make sure the watchdog
doesn't be disabled in the at91bootstrap.

It is tested on at91sam9g20ek, at91sam9263ek, at91sam9g25ek
using Documentation/watchdog/src/watchdog-simple.c.

It is based on v3.10-rc3, tested on linux-watchdog git tree as well.

Best Regards,
Wenyou Yang

Wenyou Yang (2):
ARM: dts: add the watchdog nodes for at91 SoC
ARM: dts: add the watchdog nodes for at91 boards

arch/arm/boot/dts/at91sam9263ek.dts | 4 ++++
arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 4 ++++
arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 ++++
arch/arm/boot/dts/at91sam9n12.dtsi | 6 ++++++
arch/arm/boot/dts/at91sam9n12ek.dts | 4 ++++
arch/arm/boot/dts/at91sam9x5.dtsi | 6 ++++++
arch/arm/boot/dts/at91sam9x5ek.dtsi | 4 ++++
7 files changed, 32 insertions(+)

--
1.7.9.5

2013-05-31 03:10:54

by Wenyou Yang

[permalink] [raw]

Subject: [PATCH 0/2] ARM: dts: add watchdog device tree node in at91 dts files

2013-05-31 03:11:45

by Wenyou Yang

[permalink] [raw]

Subject: [PATCH 1/2] ARM: dts: add the watchdog nodes for at91 SoC

at91sam9x5, at91sam9n12

Signed-off-by: Wenyou Yang <[email protected]>
---
arch/arm/boot/dts/at91sam9n12.dtsi | 6 ++++++
arch/arm/boot/dts/at91sam9x5.dtsi | 6 ++++++
2 files changed, 12 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 8d25f88..7f92f07 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -423,6 +423,12 @@
pinctrl-0 = <&pinctrl_spi1>;
status = "disabled";
};
+
+ watchdog@fffffe40 {
+ compatible = "atmel,at91sam9260-wdt";
+ reg = <0xfffffe40 0x10>;
+ status = "disabled";
+ };
};

nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 1145ac3..1d32064 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -648,6 +648,12 @@
interrupts = <1 4 7>;
status = "disabled";
};
+
+ watchdog@fffffe40 {
+ compatible = "atmel,at91sam9260-wdt";
+ reg = <0xfffffe40 0x10>;
+ status = "disabled";
+ };
};

nand0: nand@40000000 {
--
1.7.9.5

2013-05-31 03:12:29

by Wenyou Yang

[permalink] [raw]

Subject: [PATCH 0/2] ARM: dts: add watchdog device tree node in at91 dts files

2013-05-31 03:13:24

by Wenyou Yang

[permalink] [raw]

Subject: [PATCH 2/2] ARM: dts: add the watchdog nodes for at91 boards

boards include:
at91sam9263ek, at91sam9g20ek, at91sam9m10g45ek, at91sam9n12ek, at91sam9x5ek

Signed-off-by: Wenyou Yang <[email protected]>
---
arch/arm/boot/dts/at91sam9263ek.dts | 4 ++++
arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 4 ++++
arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 ++++
arch/arm/boot/dts/at91sam9n12ek.dts | 4 ++++
arch/arm/boot/dts/at91sam9x5ek.dtsi | 4 ++++
5 files changed, 20 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 3b82d91..9143842 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -89,6 +89,10 @@
reg = <0>;
};
};
+
+ watchdog@fffffd40 {
+ status = "okay";
+ };
};

nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 6a92c5b..6d6b888 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -106,6 +106,10 @@
reg = <1>;
};
};
+
+ watchdog@fffffd40 {
+ status = "okay";
+ };
};

nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 51d9251b5..03f391a 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -59,6 +59,10 @@
status = "okay";
};

+ watchdog@fffffd40 {
+ status = "okay";
+ };
+
mmc0: mmc@fff80000 {
pinctrl-0 = <
&pinctrl_board_mmc0
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index d30e48b..32e073f 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -77,6 +77,10 @@
reg = <0>;
};
};
+
+ watchdog@fffffe40 {
+ status = "okay";
+ };
};

nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 1fa48d2..e60b05a 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -56,6 +56,10 @@
status = "okay";
};

+ watchdog@fffffe40 {
+ status = "okay";
+ };
+
pinctrl@fffff400 {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
--
1.7.9.5

2013-05-31 09:39:27

by Richard Genoud

[permalink] [raw]

Subject: Re: [PATCH 0/2] ARM: dts: add watchdog device tree node in at91 dts files

2013/5/31 Wenyou Yang <[email protected]>:
> Hello,
>
> The patches is to add watchdog device tree node for at91 SoC and board dts files.
>
> Since the watchdog is disabled in the at91bootstrap with default configuration,
> if you want to use the watchdog in the kernel, you must make sure the watchdog
> doesn't be disabled in the at91bootstrap.
>
> It is tested on at91sam9g20ek, at91sam9263ek, at91sam9g25ek
> using Documentation/watchdog/src/watchdog-simple.c.
>
> It is based on v3.10-rc3, tested on linux-watchdog git tree as well.
>
> Best Regards,
> Wenyou Yang
>
> Wenyou Yang (2):
> ARM: dts: add the watchdog nodes for at91 SoC
> ARM: dts: add the watchdog nodes for at91 boards
>
> arch/arm/boot/dts/at91sam9263ek.dts | 4 ++++
> arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 4 ++++
> arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 ++++
> arch/arm/boot/dts/at91sam9n12.dtsi | 6 ++++++
> arch/arm/boot/dts/at91sam9n12ek.dts | 4 ++++
> arch/arm/boot/dts/at91sam9x5.dtsi | 6 ++++++
> arch/arm/boot/dts/at91sam9x5ek.dtsi | 4 ++++
> 7 files changed, 32 insertions(+)
>
> --
> 1.7.9.5
>

Those patches haven been floating around from quite some time.
Let's merge them !

Tested on sam9g35, v3.10-rc2

Tested-by: Richard Genoud <[email protected]>

2013-05-31 20:54:15

by Nicolas Ferre

[permalink] [raw]

Subject: Re: [PATCH 0/2] ARM: dts: add watchdog device tree node in at91 dts files

On 31/05/2013 11:39, Richard Genoud :
> 2013/5/31 Wenyou Yang <[email protected]>:
>> Hello,
>>
>> The patches is to add watchdog device tree node for at91 SoC and board dts files.
>>
>> Since the watchdog is disabled in the at91bootstrap with default configuration,
>> if you want to use the watchdog in the kernel, you must make sure the watchdog
>> doesn't be disabled in the at91bootstrap.
>>
>> It is tested on at91sam9g20ek, at91sam9263ek, at91sam9g25ek
>> using Documentation/watchdog/src/watchdog-simple.c.
>>
>> It is based on v3.10-rc3, tested on linux-watchdog git tree as well.
>>
>> Best Regards,
>> Wenyou Yang
>>
>> Wenyou Yang (2):
>> ARM: dts: add the watchdog nodes for at91 SoC
>> ARM: dts: add the watchdog nodes for at91 boards
>>
>> arch/arm/boot/dts/at91sam9263ek.dts | 4 ++++
>> arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 4 ++++
>> arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 ++++
>> arch/arm/boot/dts/at91sam9n12.dtsi | 6 ++++++
>> arch/arm/boot/dts/at91sam9n12ek.dts | 4 ++++
>> arch/arm/boot/dts/at91sam9x5.dtsi | 6 ++++++
>> arch/arm/boot/dts/at91sam9x5ek.dtsi | 4 ++++
>> 7 files changed, 32 insertions(+)
>>
>> --
>> 1.7.9.5
>>
>
> Those patches haven been floating around from quite some time.
> Let's merge them !
>
> Tested on sam9g35, v3.10-rc2
>
> Tested-by: Richard Genoud <[email protected]>

Both patches added to the at91-3.11-dt branch. Thanks!

Bye,
--
Nicolas Ferre