watchdog: at91sam9_wdt: add device tree support
v4 cover watchdog: at91sam9_wdt: add device tree support
Hi all,
This set of patches is for adding device tree support to the at91sam_wdt driver.
I've tested it on an at91sam9260 board (evk-pro3).
Changes:
v4:
- use "atmel,at91sam9260-wdt" as compatible
v3:
- add heartbeat option
- default disabled for all the soc, enable only for evk-pro3 board
- add at91sam9263 and at91sam9g45 soc
v2:
- add missing to and cc addresses
Fabio Porcedda (2):
watchdog: at91sam9_wdt: add device tree support
ARM: at91: add at91sam9_wdt driver to at91sam926x, at91sam9g45
.../devicetree/bindings/watchdog/atmel-wdt.txt | 19 +++++++++++++++++++ arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9263.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 6 ++++++ arch/arm/boot/dts/evk-pro3.dts | 4 ++++ drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++++++++++++ 6 files changed, 62 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
Signature · 1 line
1.7.11.3
PATCH v4 1/2 watchdog: at91sam9_wdt: add device tree support
Tested on an at91sam9260 board (evk-pro3)
--- .../devicetree/bindings/watchdog/atmel-wdt.txt | 19 +++++++++++++++++++ drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
Documentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +19 -0
@@ -0,0 +1,19 @@ +* Atmel Watchdog Timers + +** at91sam9-wdt + +Required properties: +- compatible: must be "atmel,at91sam9260-wdt". +- reg: physical base address of the controller and length of memory mapped + region. + +Optional properties: +- heartbeat: contains the watchdog heartbeats in seconds. + +Example: + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + heartbeat = <10>; + };
drivers/watchdog/at91sam9_wdt.c +21 -0
@@ -32,6 +32,7 @@#include <linux/timer.h> #include <linux/bitops.h> #include <linux/uaccess.h> +#include <linux/of.h> #include "at91sam9_wdt.h"
@@ -254,6 +255,14 @@ static struct miscdevice at91wdt_miscdev = { .fops = &at91wdt_fops, }; +static inline void __init at91wdt_probe_dt (struct device_node *node) +{ +if (!node) +return ; + +of_property_read_u32 (node,"heartbeat" , &heartbeat); +} +static int __init at91wdt_probe (struct platform_device *pdev) {struct resource *r;
@@ -272,6 +281,8 @@ static int __init at91wdt_probe(struct platform_device *pdev)return -ENOMEM ; } +at91wdt_probe_dt (pdev->dev.of_node); +/* Set watchdog */ res =at91_wdt_settimeout (ms_to_ticks (WDT_HW_TIMEOUT *1000 ));if (res)
@@ -302,11 +313,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,at91sam9260-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), }, };
Signature · 1 line
1.7.11.3
PATCH v4 1/2 watchdog: at91sam9_wdt: add device tree support
Quoted 16 lines · Fabio Porcedda
Tested on an at91sam9260 board (evk-pro3)
Signed-off-by Fabio Porcedda <[email protected]>--- .../devicetree/bindings/watchdog/atmel-wdt.txt | 19 +++++++++++++++++++ drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txtDocumentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +1
-0@@ -0,0 +1,19 @@ +* Atmel Watchdog Timers
Documentation/devicetree/bindings/watchdog/atmel-wdt.txt line 11
Quoted 10 lines
Documentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +10
-0+ +** at91sam9-wdt + +Required properties: +- compatible: must be "atmel,at91sam9260-wdt". +- reg: physical base address of the controller and length of memory mapped + region. + +Optional properties: +- heartbeat: contains the watchdog heartbeats in seconds.
more I read this binding more it's seems wrong
Today we do not use yet the watchdog framework which we will so we need to use the same binding as the watchdog framework
So when we switch the DT will not change
Best Regards,
J.
PATCH v4 1/2 watchdog: at91sam9_wdt: add device tree support
Quoted 29 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 16 lines · Fabio Porcedda
Tested on an at91sam9260 board (evk-pro3)
Signed-off-by Fabio Porcedda <[email protected]>--- .../devicetree/bindings/watchdog/atmel-wdt.txt | 19 +++++++++++++++++++ drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txtDocumentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +1
-0@@ -0,0 +1,19 @@ +* Atmel Watchdog TimersDocumentation/devicetree/bindings/watchdog/atmel-wdt.txt line 11
Quoted 10 lines
Documentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +10
-0+ +** at91sam9-wdt + +Required properties: +- compatible: must be "atmel,at91sam9260-wdt". +- reg: physical base address of the controller and length of memory mapped + region. + +Optional properties: +- heartbeat: contains the watchdog heartbeats in seconds.more I read this binding more it's seems wrong
Quoted 2 lines
Today we do not use yet the watchdog framework which we will so we need to use the same binding as the watchdog framework
What is the binding of the heartbeat value in the watchdog framework? I didn't found any binding of the heartbeat in other dt enabled drivers.
Quoted 1 line
So when we switch the DT will not change
Best regards
Signature · 1 line
Fabio Porcedda
PATCH v4 1/2 watchdog: at91sam9_wdt: add device tree support
Quoted 31 lines · Fabio Porcedda
Quoted 29 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 16 lines · Fabio Porcedda
Tested on an at91sam9260 board (evk-pro3)
Signed-off-by Fabio Porcedda <[email protected]>--- .../devicetree/bindings/watchdog/atmel-wdt.txt | 19 +++++++++++++++++++ drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txtDocumentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +1
-0@@ -0,0 +1,19 @@ +* Atmel Watchdog TimersDocumentation/devicetree/bindings/watchdog/atmel-wdt.txt line 11
Quoted 10 lines
Documentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +10
-0+ +** at91sam9-wdt + +Required properties: +- compatible: must be "atmel,at91sam9260-wdt". +- reg: physical base address of the controller and length of memory mapped + region. + +Optional properties: +- heartbeat: contains the watchdog heartbeats in seconds.more I read this binding more it's seems wrong
Quoted 5 lines
Quoted 2 lines
Today we do not use yet the watchdog framework which we will so we need to use the same binding as the watchdog framework
What is the binding of the heartbeat value in the watchdog framework? I didn't found any binding of the heartbeat in other dt enabled drivers.
when you read the new watchdog framework cf watchdog_dev.c and watchdog_core.c
you will see that we can set a timeout which have the same meaning as heartbeat
the key point here is you try to solve the DT the wrong way -> drivers specific
the binding need to be framwork specific os here we need to do the binding of the watchdog framework first and then use it in the at91sam9 driver evenif we do not switch yet. Because in the DT we describe the hw not a drvier implementation
Best Regards,
J.
PATCH v4 1/2 watchdog: at91sam9_wdt: add device tree support
Quoted 42 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 31 lines · Fabio Porcedda
Quoted 29 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 16 lines · Fabio Porcedda
Tested on an at91sam9260 board (evk-pro3)
Signed-off-by Fabio Porcedda <[email protected]>--- .../devicetree/bindings/watchdog/atmel-wdt.txt | 19 +++++++++++++++++++ drivers/watchdog/at91sam9_wdt.c | 21 +++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txtDocumentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +1
-0@@ -0,0 +1,19 @@ +* Atmel Watchdog TimersDocumentation/devicetree/bindings/watchdog/atmel-wdt.txt line 11
Quoted 10 lines
Documentation/devicetree/bindings/watchdog/atmel-wdt.txt new file +10
-0+ +** at91sam9-wdt + +Required properties: +- compatible: must be "atmel,at91sam9260-wdt". +- reg: physical base address of the controller and length of memory mapped + region. + +Optional properties: +- heartbeat: contains the watchdog heartbeats in seconds.more I read this binding more it's seems wrong
Quoted 5 lines
Quoted 2 lines
Today we do not use yet the watchdog framework which we will so we need to use the same binding as the watchdog framework
What is the binding of the heartbeat value in the watchdog framework? I didn't found any binding of the heartbeat in other dt enabled drivers.
when you read the new watchdog framework cf
watchdog_dev.candwatchdog_core.cyou will see that we can set a timeout which have the same meaning as heartbeat
Quoted 7 lines
the key point here is you try to solve the DT the wrong way -> drivers specific
the binding need to be framwork specific os here we need to do the binding of the watchdog framework first and then use it in the at91sam9 driver evenif we do not switch yet. Because in the DT we describe the hw not a drvier implementation
Ok i will try to send an updated patch following your advice.
Quoted 2 lines
Best Regards,
J.
Best regards
Signature · 1 line
Fabio Porcedda
PATCH v4 2/2 ARM: at91: add at91sam9_wdt driver to at91sam926x, at91sam9g45
In reply to Fabio PorceddaEnable the driver for the evk-pro3 board.
Tested on an at91sam9260 board (evk-pro3).
--- arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9263.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 6 ++++++ arch/arm/boot/dts/evk-pro3.dts | 4 ++++ 4 files changed, 22 insertions(+)
arch/arm/boot/dts/at91sam9260.dtsi +6 -0
@@ -236,6 +236,12 @@ trigger-external; }; }; + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + status = "disabled"; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9263.dtsi +6 -0
@@ -185,6 +185,12 @@ interrupts = <24 4 2>; status = "disabled"; }; + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + status = "disabled"; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/at91sam9g45.dtsi +6 -0
@@ -242,6 +242,12 @@ trigger-value = <0x6>; }; }; + + watchdog at fffffd40 { + compatible = "atmel,at91sam9260-wdt"; + reg = <0xfffffd40 0x10>; + status = "disabled"; + }; }; nand0: nand at 40000000 {
arch/arm/boot/dts/evk-pro3.dts +4 -0
@@ -26,6 +26,10 @@ atmel,vbus-gpio = <&pioC 5 0>; status = "okay"; }; + + watchdog at fffffd40 { + status = "okay"; + }; }; usb0: ohci at 00500000 {
Signature · 1 line
1.7.11.3
PATCH v4 2/2 ARM: at91: add at91sam9_wdt driver to at91sam926x, at91sam9g45
Quoted 10 lines · Fabio Porcedda
Enable the driver for the evk-pro3 board.
Tested on an at91sam9260 board (evk-pro3).
Signed-off-by Fabio Porcedda <[email protected]>--- arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9263.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 6 ++++++ arch/arm/boot/dts/evk-pro3.dts | 4 ++++
split board and soc
Best Regards,
J.
PATCH v4 2/2 ARM: at91: add at91sam9_wdt driver to at91sam926x, at91sam9g45
Quoted 5 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 4 lines · Fabio Porcedda
Enable the driver for the evk-pro3 board.
Tested on an at91sam9260 board (evk-pro3).
Quoted 7 lines
Quoted 6 lines
Signed-off-by Fabio Porcedda <[email protected]>--- arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9263.dtsi | 6 ++++++ arch/arm/boot/dts/at91sam9g45.dtsi | 6 ++++++ arch/arm/boot/dts/evk-pro3.dts | 4 ++++split board and soc
Ok, i will send an updated patch.
Quoted 2 lines
Best Regards,
J.
Best regards
Signature · 1 line
Fabio Porcedda