* [PATCH v5 1/3] watchdog: at91sam9_wdt: add device tree support
2012-09-27 15:40 [PATCH v5 0/3] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda
@ 2012-09-27 15:40 ` Fabio Porcedda
2012-09-27 15:40 ` [PATCH v5 2/3] ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45 Fabio Porcedda
2012-09-27 15:40 ` [PATCH v5 3/3] ARM: at91/dts: evk-pro3: enable watchdog Fabio Porcedda
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Porcedda @ 2012-09-27 15:40 UTC (permalink / raw)
To: Wim Van Sebroeck, linux-watchdog, linux-arm-kernel, Nicolas Ferre,
Jean-Christophe PLAGNIOL-VILLARD, Andrew Victor
Cc: devicetree-discuss
Tested on an at91sam9260 board (evk-pro3)
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
.../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
diff --git a/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
new file mode 100644
index 0000000..5947929
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
@@ -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@fffffd40 {
+ compatible = "atmel,at91sam9260-wdt";
+ reg = <0xfffffd40 0x10>;
+ heartbeat = <10>;
+ };
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 05e1be8..84658d7 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"
@@ -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),
},
};
--
1.7.11.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v5 2/3] ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45
2012-09-27 15:40 [PATCH v5 0/3] watchdog: at91sam9_wdt: add device tree support Fabio Porcedda
2012-09-27 15:40 ` [PATCH v5 1/3] " Fabio Porcedda
@ 2012-09-27 15:40 ` Fabio Porcedda
2012-09-27 15:40 ` [PATCH v5 3/3] ARM: at91/dts: evk-pro3: enable watchdog Fabio Porcedda
2 siblings, 0 replies; 4+ messages in thread
From: Fabio Porcedda @ 2012-09-27 15:40 UTC (permalink / raw)
To: Wim Van Sebroeck, linux-watchdog, linux-arm-kernel, Nicolas Ferre,
Jean-Christophe PLAGNIOL-VILLARD, Andrew Victor
Cc: devicetree-discuss
Tested on an at91sam9260 board (evk-pro3).
Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---
arch/arm/boot/dts/at91sam9260.dtsi | 6 ++++++
arch/arm/boot/dts/at91sam9263.dtsi | 6 ++++++
arch/arm/boot/dts/at91sam9g45.dtsi | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 7c95f76..7612193 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -236,6 +236,12 @@
trigger-external;
};
};
+
+ watchdog@fffffd40 {
+ compatible = "atmel,at91sam9260-wdt";
+ reg = <0xfffffd40 0x10>;
+ status = "disabled";
+ };
};
nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 195019b..d822240 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -185,6 +185,12 @@
interrupts = <24 4 2>;
status = "disabled";
};
+
+ watchdog@fffffd40 {
+ compatible = "atmel,at91sam9260-wdt";
+ reg = <0xfffffd40 0x10>;
+ status = "disabled";
+ };
};
nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 63751b1..df998ab 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -242,6 +242,12 @@
trigger-value = <0x6>;
};
};
+
+ watchdog@fffffd40 {
+ compatible = "atmel,at91sam9260-wdt";
+ reg = <0xfffffd40 0x10>;
+ status = "disabled";
+ };
};
nand0: nand@40000000 {
--
1.7.11.3
^ permalink raw reply related [flat|nested] 4+ messages in thread