* [PATCH 1/6] watchdog: davinci: change driver to use WDT core
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
@ 2013-11-18 17:18 ` Ivan Khoronzhuk
2013-11-19 5:12 ` Guenter Roeck
2013-11-25 11:56 ` Sekhar Nori
2013-11-18 17:18 ` [PATCH 2/6] watchdog: davinci: use davinci_wdt_device structure to hold device data Ivan Khoronzhuk
` (5 subsequent siblings)
6 siblings, 2 replies; 17+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-18 17:18 UTC (permalink / raw)
To: linux-arm-kernel
To reduce code duplicate and increase code readability use WDT core
code to handle WDT interface.
Remove io_lock as the WDT core uses mutex to lock each wdt device.
Remove wdt_state as the WDT core track state with its own variable.
The watchdog_init_timeout() can read timeout value from timeout-sec
property if the passed value is out of bounds. The heartbeat is
initialized in next way. If heartbeat is not set thought module
parameter, try to read it's value from WDT node timeout-sec property.
If node has no one, use default value.
The heartbeat is hold in wdd->timeout by WDT core, so use it in
order to set timeout period.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
drivers/watchdog/Kconfig | 2 +
drivers/watchdog/davinci_wdt.c | 152 ++++++++++------------------------------
2 files changed, 39 insertions(+), 115 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d1d53f3..d7db13d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -271,6 +271,8 @@ config IOP_WATCHDOG
config DAVINCI_WATCHDOG
tristate "DaVinci watchdog"
depends on ARCH_DAVINCI
+ select WATCHDOG_CORE
+ select WATCHDOG_NOWAYOUT
help
Say Y here if to include support for the watchdog timer
in the DaVinci DM644x/DM646x processors.
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index bead774..cb9e8c5 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -3,7 +3,7 @@
*
* Watchdog driver for DaVinci DM644x/DM646x processors
*
- * Copyright (C) 2006 Texas Instruments.
+ * Copyright (C) 2006-2013 Texas Instruments.
*
* 2007 (c) MontaVista Software, Inc. This file is licensed under
* the terms of the GNU General Public License version 2. This program
@@ -15,18 +15,12 @@
#include <linux/moduleparam.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/miscdevice.h>
#include <linux/watchdog.h>
#include <linux/init.h>
-#include <linux/bitops.h>
#include <linux/platform_device.h>
-#include <linux/spinlock.h>
-#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/device.h>
#include <linux/clk.h>
-#include <linux/slab.h>
#include <linux/err.h>
#define MODULE_NAME "DAVINCI-WDT: "
@@ -61,31 +55,12 @@
#define WDKEY_SEQ0 (0xa5c6 << 16)
#define WDKEY_SEQ1 (0xda7e << 16)
-static int heartbeat = DEFAULT_HEARTBEAT;
-
-static DEFINE_SPINLOCK(io_lock);
-static unsigned long wdt_status;
-#define WDT_IN_USE 0
-#define WDT_OK_TO_CLOSE 1
-#define WDT_REGION_INITED 2
-#define WDT_DEVICE_INITED 3
-
+static int heartbeat;
static void __iomem *wdt_base;
struct clk *wdt_clk;
+static struct watchdog_device wdt_wdd;
-static void wdt_service(void)
-{
- spin_lock(&io_lock);
-
- /* put watchdog in service state */
- iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
- /* put watchdog in active state */
- iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
-
- spin_unlock(&io_lock);
-}
-
-static void wdt_enable(void)
+static int davinci_wdt_start(struct watchdog_device *wdd)
{
u32 tgcr;
u32 timer_margin;
@@ -93,8 +68,6 @@ static void wdt_enable(void)
wdt_freq = clk_get_rate(wdt_clk);
- spin_lock(&io_lock);
-
/* disable, internal clock source */
iowrite32(0, wdt_base + TCR);
/* reset timer, set mode to 64-bit watchdog, and unreset */
@@ -105,9 +78,9 @@ static void wdt_enable(void)
iowrite32(0, wdt_base + TIM12);
iowrite32(0, wdt_base + TIM34);
/* set timeout period */
- timer_margin = (((u64)heartbeat * wdt_freq) & 0xffffffff);
+ timer_margin = (((u64)wdd->timeout * wdt_freq) & 0xffffffff);
iowrite32(timer_margin, wdt_base + PRD12);
- timer_margin = (((u64)heartbeat * wdt_freq) >> 32);
+ timer_margin = (((u64)wdd->timeout * wdt_freq) >> 32);
iowrite32(timer_margin, wdt_base + PRD34);
/* enable run continuously */
iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);
@@ -119,84 +92,28 @@ static void wdt_enable(void)
iowrite32(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
/* put watchdog in active state */
iowrite32(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
-
- spin_unlock(&io_lock);
-}
-
-static int davinci_wdt_open(struct inode *inode, struct file *file)
-{
- if (test_and_set_bit(WDT_IN_USE, &wdt_status))
- return -EBUSY;
-
- wdt_enable();
-
- return nonseekable_open(inode, file);
+ return 0;
}
-static ssize_t
-davinci_wdt_write(struct file *file, const char *data, size_t len,
- loff_t *ppos)
+static int davinci_wdt_ping(struct watchdog_device *wdd)
{
- if (len)
- wdt_service();
-
- return len;
+ /* put watchdog in service state */
+ iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
+ /* put watchdog in active state */
+ iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
+ return 0;
}
-static const struct watchdog_info ident = {
+static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
.identity = "DaVinci Watchdog",
};
-static long davinci_wdt_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
-{
- int ret = -ENOTTY;
-
- switch (cmd) {
- case WDIOC_GETSUPPORT:
- ret = copy_to_user((struct watchdog_info *)arg, &ident,
- sizeof(ident)) ? -EFAULT : 0;
- break;
-
- case WDIOC_GETSTATUS:
- case WDIOC_GETBOOTSTATUS:
- ret = put_user(0, (int *)arg);
- break;
-
- case WDIOC_KEEPALIVE:
- wdt_service();
- ret = 0;
- break;
-
- case WDIOC_GETTIMEOUT:
- ret = put_user(heartbeat, (int *)arg);
- break;
- }
- return ret;
-}
-
-static int davinci_wdt_release(struct inode *inode, struct file *file)
-{
- wdt_service();
- clear_bit(WDT_IN_USE, &wdt_status);
-
- return 0;
-}
-
-static const struct file_operations davinci_wdt_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = davinci_wdt_write,
- .unlocked_ioctl = davinci_wdt_ioctl,
- .open = davinci_wdt_open,
- .release = davinci_wdt_release,
-};
-
-static struct miscdevice davinci_wdt_miscdev = {
- .minor = WATCHDOG_MINOR,
- .name = "watchdog",
- .fops = &davinci_wdt_fops,
+static const struct watchdog_ops davinci_wdt_ops = {
+ .owner = THIS_MODULE,
+ .start = davinci_wdt_start,
+ .stop = davinci_wdt_ping,
+ .ping = davinci_wdt_ping,
};
static int davinci_wdt_probe(struct platform_device *pdev)
@@ -204,6 +121,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
int ret = 0;
struct device *dev = &pdev->dev;
struct resource *wdt_mem;
+ struct watchdog_device *wdd;
wdt_clk = devm_clk_get(dev, NULL);
if (WARN_ON(IS_ERR(wdt_clk)))
@@ -211,29 +129,34 @@ static int davinci_wdt_probe(struct platform_device *pdev)
clk_prepare_enable(wdt_clk);
- if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
- heartbeat = DEFAULT_HEARTBEAT;
+ wdd = &wdt_wdd;
+ wdd->info = &davinci_wdt_info;
+ wdd->ops = &davinci_wdt_ops;
+ wdd->min_timeout = 1;
+ wdd->max_timeout = MAX_HEARTBEAT;
+ wdd->timeout = DEFAULT_HEARTBEAT;
+
+ watchdog_init_timeout(wdd, heartbeat, dev);
+
+ dev_info(dev, "heartbeat %d sec\n", wdd->timeout);
- dev_info(dev, "heartbeat %d sec\n", heartbeat);
+ watchdog_set_nowayout(wdd, WATCHDOG_NOWAYOUT);
wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
wdt_base = devm_ioremap_resource(dev, wdt_mem);
if (IS_ERR(wdt_base))
return PTR_ERR(wdt_base);
- ret = misc_register(&davinci_wdt_miscdev);
- if (ret < 0) {
- dev_err(dev, "cannot register misc device\n");
- } else {
- set_bit(WDT_DEVICE_INITED, &wdt_status);
- }
+ ret = watchdog_register_device(wdd);
+ if (ret < 0)
+ dev_err(dev, "cannot register watchdog device\n");
return ret;
}
static int davinci_wdt_remove(struct platform_device *pdev)
{
- misc_deregister(&davinci_wdt_miscdev);
+ watchdog_unregister_device(&wdt_wdd);
clk_disable_unprepare(wdt_clk);
return 0;
@@ -247,7 +170,7 @@ MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
static struct platform_driver platform_wdt_driver = {
.driver = {
- .name = "watchdog",
+ .name = "davinci-wdt",
.owner = THIS_MODULE,
.of_match_table = davinci_wdt_of_match,
},
@@ -267,5 +190,4 @@ MODULE_PARM_DESC(heartbeat,
__MODULE_STRING(DEFAULT_HEARTBEAT));
MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
-MODULE_ALIAS("platform:watchdog");
+MODULE_ALIAS("platform:davinci-wdt");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 1/6] watchdog: davinci: change driver to use WDT core
2013-11-18 17:18 ` [PATCH 1/6] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
@ 2013-11-19 5:12 ` Guenter Roeck
2013-11-19 16:17 ` Grygorii Strashko
2013-11-25 11:56 ` Sekhar Nori
1 sibling, 1 reply; 17+ messages in thread
From: Guenter Roeck @ 2013-11-19 5:12 UTC (permalink / raw)
To: linux-arm-kernel
On 11/18/2013 09:18 AM, Ivan Khoronzhuk wrote:
> To reduce code duplicate and increase code readability use WDT core
> code to handle WDT interface.
>
> Remove io_lock as the WDT core uses mutex to lock each wdt device.
> Remove wdt_state as the WDT core track state with its own variable.
>
> The watchdog_init_timeout() can read timeout value from timeout-sec
> property if the passed value is out of bounds. The heartbeat is
> initialized in next way. If heartbeat is not set thought module
> parameter, try to read it's value from WDT node timeout-sec property.
> If node has no one, use default value.
>
> The heartbeat is hold in wdd->timeout by WDT core, so use it in
> order to set timeout period.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> drivers/watchdog/Kconfig | 2 +
> drivers/watchdog/davinci_wdt.c | 152 ++++++++++------------------------------
> 2 files changed, 39 insertions(+), 115 deletions(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index d1d53f3..d7db13d 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -271,6 +271,8 @@ config IOP_WATCHDOG
> config DAVINCI_WATCHDOG
> tristate "DaVinci watchdog"
> depends on ARCH_DAVINCI
> + select WATCHDOG_CORE
> + select WATCHDOG_NOWAYOUT
Is this mandatory, ie is it correct that the watchdog can not be stopped once started ?
Assuming it is,
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> help
> Say Y here if to include support for the watchdog timer
> in the DaVinci DM644x/DM646x processors.
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index bead774..cb9e8c5 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -3,7 +3,7 @@
> *
> * Watchdog driver for DaVinci DM644x/DM646x processors
> *
> - * Copyright (C) 2006 Texas Instruments.
> + * Copyright (C) 2006-2013 Texas Instruments.
> *
> * 2007 (c) MontaVista Software, Inc. This file is licensed under
> * the terms of the GNU General Public License version 2. This program
> @@ -15,18 +15,12 @@
> #include <linux/moduleparam.h>
> #include <linux/types.h>
> #include <linux/kernel.h>
> -#include <linux/fs.h>
> -#include <linux/miscdevice.h>
> #include <linux/watchdog.h>
> #include <linux/init.h>
> -#include <linux/bitops.h>
> #include <linux/platform_device.h>
> -#include <linux/spinlock.h>
> -#include <linux/uaccess.h>
> #include <linux/io.h>
> #include <linux/device.h>
> #include <linux/clk.h>
> -#include <linux/slab.h>
> #include <linux/err.h>
>
> #define MODULE_NAME "DAVINCI-WDT: "
> @@ -61,31 +55,12 @@
> #define WDKEY_SEQ0 (0xa5c6 << 16)
> #define WDKEY_SEQ1 (0xda7e << 16)
>
> -static int heartbeat = DEFAULT_HEARTBEAT;
> -
> -static DEFINE_SPINLOCK(io_lock);
> -static unsigned long wdt_status;
> -#define WDT_IN_USE 0
> -#define WDT_OK_TO_CLOSE 1
> -#define WDT_REGION_INITED 2
> -#define WDT_DEVICE_INITED 3
> -
> +static int heartbeat;
> static void __iomem *wdt_base;
> struct clk *wdt_clk;
> +static struct watchdog_device wdt_wdd;
>
> -static void wdt_service(void)
> -{
> - spin_lock(&io_lock);
> -
> - /* put watchdog in service state */
> - iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
> - /* put watchdog in active state */
> - iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
> -
> - spin_unlock(&io_lock);
> -}
> -
> -static void wdt_enable(void)
> +static int davinci_wdt_start(struct watchdog_device *wdd)
> {
> u32 tgcr;
> u32 timer_margin;
> @@ -93,8 +68,6 @@ static void wdt_enable(void)
>
> wdt_freq = clk_get_rate(wdt_clk);
>
> - spin_lock(&io_lock);
> -
> /* disable, internal clock source */
> iowrite32(0, wdt_base + TCR);
> /* reset timer, set mode to 64-bit watchdog, and unreset */
> @@ -105,9 +78,9 @@ static void wdt_enable(void)
> iowrite32(0, wdt_base + TIM12);
> iowrite32(0, wdt_base + TIM34);
> /* set timeout period */
> - timer_margin = (((u64)heartbeat * wdt_freq) & 0xffffffff);
> + timer_margin = (((u64)wdd->timeout * wdt_freq) & 0xffffffff);
> iowrite32(timer_margin, wdt_base + PRD12);
> - timer_margin = (((u64)heartbeat * wdt_freq) >> 32);
> + timer_margin = (((u64)wdd->timeout * wdt_freq) >> 32);
> iowrite32(timer_margin, wdt_base + PRD34);
> /* enable run continuously */
> iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);
> @@ -119,84 +92,28 @@ static void wdt_enable(void)
> iowrite32(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
> /* put watchdog in active state */
> iowrite32(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
> -
> - spin_unlock(&io_lock);
> -}
> -
> -static int davinci_wdt_open(struct inode *inode, struct file *file)
> -{
> - if (test_and_set_bit(WDT_IN_USE, &wdt_status))
> - return -EBUSY;
> -
> - wdt_enable();
> -
> - return nonseekable_open(inode, file);
> + return 0;
> }
>
> -static ssize_t
> -davinci_wdt_write(struct file *file, const char *data, size_t len,
> - loff_t *ppos)
> +static int davinci_wdt_ping(struct watchdog_device *wdd)
> {
> - if (len)
> - wdt_service();
> -
> - return len;
> + /* put watchdog in service state */
> + iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
> + /* put watchdog in active state */
> + iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
> + return 0;
> }
>
> -static const struct watchdog_info ident = {
> +static const struct watchdog_info davinci_wdt_info = {
> .options = WDIOF_KEEPALIVEPING,
> .identity = "DaVinci Watchdog",
> };
>
> -static long davinci_wdt_ioctl(struct file *file,
> - unsigned int cmd, unsigned long arg)
> -{
> - int ret = -ENOTTY;
> -
> - switch (cmd) {
> - case WDIOC_GETSUPPORT:
> - ret = copy_to_user((struct watchdog_info *)arg, &ident,
> - sizeof(ident)) ? -EFAULT : 0;
> - break;
> -
> - case WDIOC_GETSTATUS:
> - case WDIOC_GETBOOTSTATUS:
> - ret = put_user(0, (int *)arg);
> - break;
> -
> - case WDIOC_KEEPALIVE:
> - wdt_service();
> - ret = 0;
> - break;
> -
> - case WDIOC_GETTIMEOUT:
> - ret = put_user(heartbeat, (int *)arg);
> - break;
> - }
> - return ret;
> -}
> -
> -static int davinci_wdt_release(struct inode *inode, struct file *file)
> -{
> - wdt_service();
> - clear_bit(WDT_IN_USE, &wdt_status);
> -
> - return 0;
> -}
> -
> -static const struct file_operations davinci_wdt_fops = {
> - .owner = THIS_MODULE,
> - .llseek = no_llseek,
> - .write = davinci_wdt_write,
> - .unlocked_ioctl = davinci_wdt_ioctl,
> - .open = davinci_wdt_open,
> - .release = davinci_wdt_release,
> -};
> -
> -static struct miscdevice davinci_wdt_miscdev = {
> - .minor = WATCHDOG_MINOR,
> - .name = "watchdog",
> - .fops = &davinci_wdt_fops,
> +static const struct watchdog_ops davinci_wdt_ops = {
> + .owner = THIS_MODULE,
> + .start = davinci_wdt_start,
> + .stop = davinci_wdt_ping,
> + .ping = davinci_wdt_ping,
> };
>
> static int davinci_wdt_probe(struct platform_device *pdev)
> @@ -204,6 +121,7 @@ static int davinci_wdt_probe(struct platform_device *pdev)
> int ret = 0;
> struct device *dev = &pdev->dev;
> struct resource *wdt_mem;
> + struct watchdog_device *wdd;
>
> wdt_clk = devm_clk_get(dev, NULL);
> if (WARN_ON(IS_ERR(wdt_clk)))
> @@ -211,29 +129,34 @@ static int davinci_wdt_probe(struct platform_device *pdev)
>
> clk_prepare_enable(wdt_clk);
>
> - if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
> - heartbeat = DEFAULT_HEARTBEAT;
> + wdd = &wdt_wdd;
> + wdd->info = &davinci_wdt_info;
> + wdd->ops = &davinci_wdt_ops;
> + wdd->min_timeout = 1;
> + wdd->max_timeout = MAX_HEARTBEAT;
> + wdd->timeout = DEFAULT_HEARTBEAT;
> +
> + watchdog_init_timeout(wdd, heartbeat, dev);
> +
> + dev_info(dev, "heartbeat %d sec\n", wdd->timeout);
>
> - dev_info(dev, "heartbeat %d sec\n", heartbeat);
> + watchdog_set_nowayout(wdd, WATCHDOG_NOWAYOUT);
>
> wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> wdt_base = devm_ioremap_resource(dev, wdt_mem);
> if (IS_ERR(wdt_base))
> return PTR_ERR(wdt_base);
>
> - ret = misc_register(&davinci_wdt_miscdev);
> - if (ret < 0) {
> - dev_err(dev, "cannot register misc device\n");
> - } else {
> - set_bit(WDT_DEVICE_INITED, &wdt_status);
> - }
> + ret = watchdog_register_device(wdd);
> + if (ret < 0)
> + dev_err(dev, "cannot register watchdog device\n");
>
> return ret;
> }
>
> static int davinci_wdt_remove(struct platform_device *pdev)
> {
> - misc_deregister(&davinci_wdt_miscdev);
> + watchdog_unregister_device(&wdt_wdd);
> clk_disable_unprepare(wdt_clk);
>
> return 0;
> @@ -247,7 +170,7 @@ MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
>
> static struct platform_driver platform_wdt_driver = {
> .driver = {
> - .name = "watchdog",
> + .name = "davinci-wdt",
> .owner = THIS_MODULE,
> .of_match_table = davinci_wdt_of_match,
> },
> @@ -267,5 +190,4 @@ MODULE_PARM_DESC(heartbeat,
> __MODULE_STRING(DEFAULT_HEARTBEAT));
>
> MODULE_LICENSE("GPL");
> -MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
> -MODULE_ALIAS("platform:watchdog");
> +MODULE_ALIAS("platform:davinci-wdt");
>
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 1/6] watchdog: davinci: change driver to use WDT core
2013-11-19 5:12 ` Guenter Roeck
@ 2013-11-19 16:17 ` Grygorii Strashko
0 siblings, 0 replies; 17+ messages in thread
From: Grygorii Strashko @ 2013-11-19 16:17 UTC (permalink / raw)
To: linux-arm-kernel
On 11/19/2013 07:12 AM, Guenter Roeck wrote:
> On 11/18/2013 09:18 AM, Ivan Khoronzhuk wrote:
>> To reduce code duplicate and increase code readability use WDT core
>> code to handle WDT interface.
>>
>> Remove io_lock as the WDT core uses mutex to lock each wdt device.
>> Remove wdt_state as the WDT core track state with its own variable.
>>
>> The watchdog_init_timeout() can read timeout value from timeout-sec
>> property if the passed value is out of bounds. The heartbeat is
>> initialized in next way. If heartbeat is not set thought module
>> parameter, try to read it's value from WDT node timeout-sec property.
>> If node has no one, use default value.
>>
>> The heartbeat is hold in wdd->timeout by WDT core, so use it in
>> order to set timeout period.
>>
>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
>> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>> ---
>> drivers/watchdog/Kconfig | 2 +
>> drivers/watchdog/davinci_wdt.c | 152
>> ++++++++++------------------------------
>> 2 files changed, 39 insertions(+), 115 deletions(-)
>>
>> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
>> index d1d53f3..d7db13d 100644
>> --- a/drivers/watchdog/Kconfig
>> +++ b/drivers/watchdog/Kconfig
>> @@ -271,6 +271,8 @@ config IOP_WATCHDOG
>> config DAVINCI_WATCHDOG
>> tristate "DaVinci watchdog"
>> depends on ARCH_DAVINCI
>> + select WATCHDOG_CORE
>> + select WATCHDOG_NOWAYOUT
>
> Is this mandatory, ie is it correct that the watchdog can not be stopped
> once started ?
>
> Assuming it is,
Yes, it is. Davinci WDT can't be stopped and once it's expired - it can
be rearmed only after hardware reset.
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
Thanks a lot for your review.
Regards,
-grygorii
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/6] watchdog: davinci: change driver to use WDT core
2013-11-18 17:18 ` [PATCH 1/6] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
2013-11-19 5:12 ` Guenter Roeck
@ 2013-11-25 11:56 ` Sekhar Nori
2013-11-25 12:06 ` ivan.khoronzhuk
1 sibling, 1 reply; 17+ messages in thread
From: Sekhar Nori @ 2013-11-25 11:56 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 18 November 2013 10:48 PM, Ivan Khoronzhuk wrote:
> @@ -211,29 +129,34 @@ static int davinci_wdt_probe(struct platform_device *pdev)
>
> clk_prepare_enable(wdt_clk);
>
> - if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
> - heartbeat = DEFAULT_HEARTBEAT;
> + wdd = &wdt_wdd;
> + wdd->info = &davinci_wdt_info;
> + wdd->ops = &davinci_wdt_ops;
> + wdd->min_timeout = 1;
> + wdd->max_timeout = MAX_HEARTBEAT;
Some checkpatch warnings. Please fix.
WARNING: please, no space before tabs
#273: FILE: drivers/watchdog/davinci_wdt.c:135:
+^Iwdd->min_timeout ^I= 1;$
WARNING: please, no space before tabs
#274: FILE: drivers/watchdog/davinci_wdt.c:136:
+^Iwdd->max_timeout ^I= MAX_HEARTBEAT;$
total: 0 errors, 2 warnings, 0 checks, 249 lines checked
Thanks,
sekhar
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/6] watchdog: davinci: change driver to use WDT core
2013-11-25 11:56 ` Sekhar Nori
@ 2013-11-25 12:06 ` ivan.khoronzhuk
0 siblings, 0 replies; 17+ messages in thread
From: ivan.khoronzhuk @ 2013-11-25 12:06 UTC (permalink / raw)
To: linux-arm-kernel
On 11/25/2013 01:56 PM, Sekhar Nori wrote:
> On Monday 18 November 2013 10:48 PM, Ivan Khoronzhuk wrote:
>> @@ -211,29 +129,34 @@ static int davinci_wdt_probe(struct platform_device *pdev)
>>
>> clk_prepare_enable(wdt_clk);
>>
>> - if (heartbeat < 1 || heartbeat > MAX_HEARTBEAT)
>> - heartbeat = DEFAULT_HEARTBEAT;
>> + wdd = &wdt_wdd;
>> + wdd->info = &davinci_wdt_info;
>> + wdd->ops = &davinci_wdt_ops;
>> + wdd->min_timeout = 1;
>> + wdd->max_timeout = MAX_HEARTBEAT;
>
> Some checkpatch warnings. Please fix.
>
> WARNING: please, no space before tabs
> #273: FILE: drivers/watchdog/davinci_wdt.c:135:
> +^Iwdd->min_timeout ^I= 1;$
>
> WARNING: please, no space before tabs
> #274: FILE: drivers/watchdog/davinci_wdt.c:136:
> +^Iwdd->max_timeout ^I= MAX_HEARTBEAT;$
>
> total: 0 errors, 2 warnings, 0 checks, 249 lines checked
>
> Thanks,
> sekhar
>
Thanks, I will
--
Regards,
Ivan Khoronzhuk
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 2/6] watchdog: davinci: use davinci_wdt_device structure to hold device data
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
2013-11-18 17:18 ` [PATCH 1/6] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
@ 2013-11-18 17:18 ` Ivan Khoronzhuk
2013-11-18 17:18 ` [PATCH 3/6] watchdog: davinci: add GET_TIMELEFT option support Ivan Khoronzhuk
` (4 subsequent siblings)
6 siblings, 0 replies; 17+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-18 17:18 UTC (permalink / raw)
To: linux-arm-kernel
Some SoCs, like Keystone 2, can support more than one WDT and each
watchdog device has to use it's own base address, clock source,
watchdog device, so add new davinci_wdt_device structure to hold
device data.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter roeck <linux@roeck-us.net>
---
drivers/watchdog/davinci_wdt.c | 74 ++++++++++++++++++++++++++--------------
1 file changed, 48 insertions(+), 26 deletions(-)
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index cb9e8c5..b353df5 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -56,51 +56,63 @@
#define WDKEY_SEQ1 (0xda7e << 16)
static int heartbeat;
-static void __iomem *wdt_base;
-struct clk *wdt_clk;
-static struct watchdog_device wdt_wdd;
+
+/*
+ * struct to hold data for each WDT device
+ * @base - base io address of WD device
+ * @clk - source clock of WDT
+ * @wdd - hold watchdog device as is in WDT core
+ */
+struct davinci_wdt_device {
+ void __iomem *base;
+ struct clk *clk;
+ struct watchdog_device wdd;
+};
static int davinci_wdt_start(struct watchdog_device *wdd)
{
u32 tgcr;
u32 timer_margin;
unsigned long wdt_freq;
+ struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
- wdt_freq = clk_get_rate(wdt_clk);
+ wdt_freq = clk_get_rate(davinci_wdt->clk);
/* disable, internal clock source */
- iowrite32(0, wdt_base + TCR);
+ iowrite32(0, davinci_wdt->base + TCR);
/* reset timer, set mode to 64-bit watchdog, and unreset */
- iowrite32(0, wdt_base + TGCR);
+ iowrite32(0, davinci_wdt->base + TGCR);
tgcr = TIMMODE_64BIT_WDOG | TIM12RS_UNRESET | TIM34RS_UNRESET;
- iowrite32(tgcr, wdt_base + TGCR);
+ iowrite32(tgcr, davinci_wdt->base + TGCR);
/* clear counter regs */
- iowrite32(0, wdt_base + TIM12);
- iowrite32(0, wdt_base + TIM34);
+ iowrite32(0, davinci_wdt->base + TIM12);
+ iowrite32(0, davinci_wdt->base + TIM34);
/* set timeout period */
timer_margin = (((u64)wdd->timeout * wdt_freq) & 0xffffffff);
- iowrite32(timer_margin, wdt_base + PRD12);
+ iowrite32(timer_margin, davinci_wdt->base + PRD12);
timer_margin = (((u64)wdd->timeout * wdt_freq) >> 32);
- iowrite32(timer_margin, wdt_base + PRD34);
+ iowrite32(timer_margin, davinci_wdt->base + PRD34);
/* enable run continuously */
- iowrite32(ENAMODE12_PERIODIC, wdt_base + TCR);
+ iowrite32(ENAMODE12_PERIODIC, davinci_wdt->base + TCR);
/* Once the WDT is in pre-active state write to
* TIM12, TIM34, PRD12, PRD34, TCR, TGCR, WDTCR are
* write protected (except for the WDKEY field)
*/
/* put watchdog in pre-active state */
- iowrite32(WDKEY_SEQ0 | WDEN, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ0 | WDEN, davinci_wdt->base + WDTCR);
/* put watchdog in active state */
- iowrite32(WDKEY_SEQ1 | WDEN, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ1 | WDEN, davinci_wdt->base + WDTCR);
return 0;
}
static int davinci_wdt_ping(struct watchdog_device *wdd)
{
+ struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
+
/* put watchdog in service state */
- iowrite32(WDKEY_SEQ0, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ0, davinci_wdt->base + WDTCR);
/* put watchdog in active state */
- iowrite32(WDKEY_SEQ1, wdt_base + WDTCR);
+ iowrite32(WDKEY_SEQ1, davinci_wdt->base + WDTCR);
return 0;
}
@@ -122,14 +134,21 @@ static int davinci_wdt_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct resource *wdt_mem;
struct watchdog_device *wdd;
+ struct davinci_wdt_device *davinci_wdt;
+
+ davinci_wdt = devm_kzalloc(dev, sizeof(*davinci_wdt), GFP_KERNEL);
+ if (!davinci_wdt)
+ return -ENOMEM;
- wdt_clk = devm_clk_get(dev, NULL);
- if (WARN_ON(IS_ERR(wdt_clk)))
- return PTR_ERR(wdt_clk);
+ davinci_wdt->clk = devm_clk_get(dev, NULL);
+ if (WARN_ON(IS_ERR(davinci_wdt->clk)))
+ return PTR_ERR(davinci_wdt->clk);
- clk_prepare_enable(wdt_clk);
+ clk_prepare_enable(davinci_wdt->clk);
- wdd = &wdt_wdd;
+ platform_set_drvdata(pdev, davinci_wdt);
+
+ wdd = &davinci_wdt->wdd;
wdd->info = &davinci_wdt_info;
wdd->ops = &davinci_wdt_ops;
wdd->min_timeout = 1;
@@ -140,12 +159,13 @@ static int davinci_wdt_probe(struct platform_device *pdev)
dev_info(dev, "heartbeat %d sec\n", wdd->timeout);
+ watchdog_set_drvdata(wdd, davinci_wdt);
watchdog_set_nowayout(wdd, WATCHDOG_NOWAYOUT);
wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- wdt_base = devm_ioremap_resource(dev, wdt_mem);
- if (IS_ERR(wdt_base))
- return PTR_ERR(wdt_base);
+ davinci_wdt->base = devm_ioremap_resource(dev, wdt_mem);
+ if (IS_ERR(davinci_wdt->base))
+ return PTR_ERR(davinci_wdt->base);
ret = watchdog_register_device(wdd);
if (ret < 0)
@@ -156,8 +176,10 @@ static int davinci_wdt_probe(struct platform_device *pdev)
static int davinci_wdt_remove(struct platform_device *pdev)
{
- watchdog_unregister_device(&wdt_wdd);
- clk_disable_unprepare(wdt_clk);
+ struct davinci_wdt_device *davinci_wdt = platform_get_drvdata(pdev);
+
+ watchdog_unregister_device(&davinci_wdt->wdd);
+ clk_disable_unprepare(davinci_wdt->clk);
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 3/6] watchdog: davinci: add GET_TIMELEFT option support
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
2013-11-18 17:18 ` [PATCH 1/6] watchdog: davinci: change driver to use WDT core Ivan Khoronzhuk
2013-11-18 17:18 ` [PATCH 2/6] watchdog: davinci: use davinci_wdt_device structure to hold device data Ivan Khoronzhuk
@ 2013-11-18 17:18 ` Ivan Khoronzhuk
2013-11-19 5:14 ` Guenter Roeck
2013-11-18 17:18 ` [PATCH 4/6] watchdog: davinci: add "timeout-sec" property Ivan Khoronzhuk
` (3 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-18 17:18 UTC (permalink / raw)
To: linux-arm-kernel
Currently, the davinci watchdog can be read while counting,
so we can add ability to report the remaining time before
the system will reboot.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
drivers/watchdog/davinci_wdt.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index b353df5..55deaf8 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -116,6 +116,31 @@ static int davinci_wdt_ping(struct watchdog_device *wdd)
return 0;
}
+static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
+{
+ u64 timer_counter;
+ unsigned long freq;
+ u32 val;
+ struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
+
+ /* if timeout has occured then return 0 */
+ val = ioread32(davinci_wdt->base + WDTCR);
+ if (val & WDFLAG)
+ return 0;
+
+ freq = clk_get_rate(davinci_wdt->clk);
+
+ if (!freq)
+ return 0;
+
+ timer_counter = ioread32(davinci_wdt->base + TIM12);
+ timer_counter |= ((u64)ioread32(davinci_wdt->base + TIM34) << 32);
+
+ do_div(timer_counter, freq);
+
+ return wdd->timeout - timer_counter;
+}
+
static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
.identity = "DaVinci Watchdog",
@@ -126,6 +151,7 @@ static const struct watchdog_ops davinci_wdt_ops = {
.start = davinci_wdt_start,
.stop = davinci_wdt_ping,
.ping = davinci_wdt_ping,
+ .get_timeleft = davinci_wdt_get_timeleft,
};
static int davinci_wdt_probe(struct platform_device *pdev)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 3/6] watchdog: davinci: add GET_TIMELEFT option support
2013-11-18 17:18 ` [PATCH 3/6] watchdog: davinci: add GET_TIMELEFT option support Ivan Khoronzhuk
@ 2013-11-19 5:14 ` Guenter Roeck
0 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-11-19 5:14 UTC (permalink / raw)
To: linux-arm-kernel
On 11/18/2013 09:18 AM, Ivan Khoronzhuk wrote:
> Currently, the davinci watchdog can be read while counting,
> so we can add ability to report the remaining time before
> the system will reboot.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/davinci_wdt.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index b353df5..55deaf8 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -116,6 +116,31 @@ static int davinci_wdt_ping(struct watchdog_device *wdd)
> return 0;
> }
>
> +static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
> +{
> + u64 timer_counter;
> + unsigned long freq;
> + u32 val;
> + struct davinci_wdt_device *davinci_wdt = watchdog_get_drvdata(wdd);
> +
> + /* if timeout has occured then return 0 */
> + val = ioread32(davinci_wdt->base + WDTCR);
> + if (val & WDFLAG)
> + return 0;
> +
> + freq = clk_get_rate(davinci_wdt->clk);
> +
> + if (!freq)
> + return 0;
> +
> + timer_counter = ioread32(davinci_wdt->base + TIM12);
> + timer_counter |= ((u64)ioread32(davinci_wdt->base + TIM34) << 32);
> +
> + do_div(timer_counter, freq);
> +
> + return wdd->timeout - timer_counter;
> +}
> +
> static const struct watchdog_info davinci_wdt_info = {
> .options = WDIOF_KEEPALIVEPING,
> .identity = "DaVinci Watchdog",
> @@ -126,6 +151,7 @@ static const struct watchdog_ops davinci_wdt_ops = {
> .start = davinci_wdt_start,
> .stop = davinci_wdt_ping,
> .ping = davinci_wdt_ping,
> + .get_timeleft = davinci_wdt_get_timeleft,
> };
>
> static int davinci_wdt_probe(struct platform_device *pdev)
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/6] watchdog: davinci: add "timeout-sec" property
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
` (2 preceding siblings ...)
2013-11-18 17:18 ` [PATCH 3/6] watchdog: davinci: add GET_TIMELEFT option support Ivan Khoronzhuk
@ 2013-11-18 17:18 ` Ivan Khoronzhuk
2013-11-19 5:15 ` Guenter Roeck
2013-11-18 17:18 ` [PATCH 5/6] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
` (2 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-18 17:18 UTC (permalink / raw)
To: linux-arm-kernel
Since Davinci WDT has been switched to use WDT core, it became able
to support timeout-sec property, so add it to it's binding description.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
.../devicetree/bindings/watchdog/davinci-wdt.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
index 75558cc..e450134 100644
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -4,9 +4,13 @@ Required properties:
- compatible : Should be "ti,davinci-wdt"
- reg : Should contain WDT registers location and length
+Optional properties:
+- timeout-sec : Contains the watchdog timeout in seconds
+
Examples:
wdt: wdt at 2320000 {
compatible = "ti,davinci-wdt";
reg = <0x02320000 0x80>;
+ timeout-sec = <30>;
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/6] watchdog: davinci: add "timeout-sec" property
2013-11-18 17:18 ` [PATCH 4/6] watchdog: davinci: add "timeout-sec" property Ivan Khoronzhuk
@ 2013-11-19 5:15 ` Guenter Roeck
0 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-11-19 5:15 UTC (permalink / raw)
To: linux-arm-kernel
On 11/18/2013 09:18 AM, Ivan Khoronzhuk wrote:
> Since Davinci WDT has been switched to use WDT core, it became able
> to support timeout-sec property, so add it to it's binding description.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
> ---
> .../devicetree/bindings/watchdog/davinci-wdt.txt | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> index 75558cc..e450134 100644
> --- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> @@ -4,9 +4,13 @@ Required properties:
> - compatible : Should be "ti,davinci-wdt"
> - reg : Should contain WDT registers location and length
>
> +Optional properties:
> +- timeout-sec : Contains the watchdog timeout in seconds
> +
> Examples:
>
> wdt: wdt at 2320000 {
> compatible = "ti,davinci-wdt";
> reg = <0x02320000 0x80>;
> + timeout-sec = <30>;
> };
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/6] watchdog: davinci: reuse driver for keystone arch
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
` (3 preceding siblings ...)
2013-11-18 17:18 ` [PATCH 4/6] watchdog: davinci: add "timeout-sec" property Ivan Khoronzhuk
@ 2013-11-18 17:18 ` Ivan Khoronzhuk
2013-11-19 5:16 ` Guenter Roeck
2013-11-18 17:18 ` [PATCH 6/6] arm: dts: keystone: add watchdog entry Ivan Khoronzhuk
2013-11-25 13:06 ` [PATCH v2 0/6] Update Davinci watchdog driver Sekhar Nori
6 siblings, 1 reply; 17+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-18 17:18 UTC (permalink / raw)
To: linux-arm-kernel
The keystone arch use the same IP watchdog, so add "ti,keystone-wdt"
compatible and correct identity.
The Keystone arch is using clocks in DT and source clock for watchdog
has to be specified, so add this to binding.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
.../devicetree/bindings/watchdog/davinci-wdt.txt | 11 +++++++++--
drivers/watchdog/Kconfig | 4 ++--
drivers/watchdog/davinci_wdt.c | 3 ++-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
index e450134..0f1aa99 100644
--- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
+++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
@@ -1,16 +1,23 @@
-DaVinci Watchdog Timer (WDT) Controller
+Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
Required properties:
-- compatible : Should be "ti,davinci-wdt"
+- compatible : Should be "ti,davinci-wdt" or "ti,keystone-wdt"
- reg : Should contain WDT registers location and length
+- clocks : phandle reference to the controller clock.
+ Required only for Keystone arch. See clock-bindings.txt
Optional properties:
- timeout-sec : Contains the watchdog timeout in seconds
+Documentation:
+Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
+Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
+
Examples:
wdt: wdt at 2320000 {
compatible = "ti,davinci-wdt";
reg = <0x02320000 0x80>;
timeout-sec = <30>;
+ clocks = <&clkwdtimer0>;
};
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index d7db13d..addfc2c 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -270,12 +270,12 @@ config IOP_WATCHDOG
config DAVINCI_WATCHDOG
tristate "DaVinci watchdog"
- depends on ARCH_DAVINCI
+ depends on ARCH_DAVINCI || ARCH_KEYSTONE
select WATCHDOG_CORE
select WATCHDOG_NOWAYOUT
help
Say Y here if to include support for the watchdog timer
- in the DaVinci DM644x/DM646x processors.
+ in the DaVinci DM644x/DM646x or Keystone processors.
To compile this driver as a module, choose M here: the
module will be called davinci_wdt.
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 55deaf8..a6d365a 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -143,7 +143,7 @@ static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
static const struct watchdog_info davinci_wdt_info = {
.options = WDIOF_KEEPALIVEPING,
- .identity = "DaVinci Watchdog",
+ .identity = "DaVinci/Keystone Watchdog",
};
static const struct watchdog_ops davinci_wdt_ops = {
@@ -212,6 +212,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
static const struct of_device_id davinci_wdt_of_match[] = {
{ .compatible = "ti,davinci-wdt", },
+ { .compatible = "ti,keystone-wdt", },
{},
};
MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 5/6] watchdog: davinci: reuse driver for keystone arch
2013-11-18 17:18 ` [PATCH 5/6] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
@ 2013-11-19 5:16 ` Guenter Roeck
0 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-11-19 5:16 UTC (permalink / raw)
To: linux-arm-kernel
On 11/18/2013 09:18 AM, Ivan Khoronzhuk wrote:
> The keystone arch use the same IP watchdog, so add "ti,keystone-wdt"
> compatible and correct identity.
>
> The Keystone arch is using clocks in DT and source clock for watchdog
> has to be specified, so add this to binding.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> .../devicetree/bindings/watchdog/davinci-wdt.txt | 11 +++++++++--
> drivers/watchdog/Kconfig | 4 ++--
> drivers/watchdog/davinci_wdt.c | 3 ++-
> 3 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> index e450134..0f1aa99 100644
> --- a/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> +++ b/Documentation/devicetree/bindings/watchdog/davinci-wdt.txt
> @@ -1,16 +1,23 @@
> -DaVinci Watchdog Timer (WDT) Controller
> +Texas Instruments DaVinci/Keystone Watchdog Timer (WDT) Controller
>
> Required properties:
> -- compatible : Should be "ti,davinci-wdt"
> +- compatible : Should be "ti,davinci-wdt" or "ti,keystone-wdt"
> - reg : Should contain WDT registers location and length
> +- clocks : phandle reference to the controller clock.
> + Required only for Keystone arch. See clock-bindings.txt
>
> Optional properties:
> - timeout-sec : Contains the watchdog timeout in seconds
>
> +Documentation:
> +Davinci DM646x - http://www.ti.com/lit/ug/spruer5b/spruer5b.pdf
> +Keystone - http://www.ti.com/lit/ug/sprugv5a/sprugv5a.pdf
> +
> Examples:
>
> wdt: wdt at 2320000 {
> compatible = "ti,davinci-wdt";
> reg = <0x02320000 0x80>;
> timeout-sec = <30>;
> + clocks = <&clkwdtimer0>;
> };
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index d7db13d..addfc2c 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -270,12 +270,12 @@ config IOP_WATCHDOG
>
> config DAVINCI_WATCHDOG
> tristate "DaVinci watchdog"
> - depends on ARCH_DAVINCI
> + depends on ARCH_DAVINCI || ARCH_KEYSTONE
> select WATCHDOG_CORE
> select WATCHDOG_NOWAYOUT
> help
> Say Y here if to include support for the watchdog timer
> - in the DaVinci DM644x/DM646x processors.
> + in the DaVinci DM644x/DM646x or Keystone processors.
> To compile this driver as a module, choose M here: the
> module will be called davinci_wdt.
>
> diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
> index 55deaf8..a6d365a 100644
> --- a/drivers/watchdog/davinci_wdt.c
> +++ b/drivers/watchdog/davinci_wdt.c
> @@ -143,7 +143,7 @@ static unsigned int davinci_wdt_get_timeleft(struct watchdog_device *wdd)
>
> static const struct watchdog_info davinci_wdt_info = {
> .options = WDIOF_KEEPALIVEPING,
> - .identity = "DaVinci Watchdog",
> + .identity = "DaVinci/Keystone Watchdog",
> };
>
> static const struct watchdog_ops davinci_wdt_ops = {
> @@ -212,6 +212,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
>
> static const struct of_device_id davinci_wdt_of_match[] = {
> { .compatible = "ti,davinci-wdt", },
> + { .compatible = "ti,keystone-wdt", },
> {},
> };
> MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 6/6] arm: dts: keystone: add watchdog entry
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
` (4 preceding siblings ...)
2013-11-18 17:18 ` [PATCH 5/6] watchdog: davinci: reuse driver for keystone arch Ivan Khoronzhuk
@ 2013-11-18 17:18 ` Ivan Khoronzhuk
2013-11-25 13:06 ` [PATCH v2 0/6] Update Davinci watchdog driver Sekhar Nori
6 siblings, 0 replies; 17+ messages in thread
From: Ivan Khoronzhuk @ 2013-11-18 17:18 UTC (permalink / raw)
To: linux-arm-kernel
Add watchdog entry to keystone device tree.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>
---
arch/arm/boot/dts/keystone.dts | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/keystone.dts b/arch/arm/boot/dts/keystone.dts
index 100bdf5..a6e5f91 100644
--- a/arch/arm/boot/dts/keystone.dts
+++ b/arch/arm/boot/dts/keystone.dts
@@ -179,5 +179,11 @@
interrupts = <GIC_SPI 300 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkspi>;
};
+
+ wdt: wdt at 022f0080 {
+ compatible = "ti,keystone-wdt";
+ reg = <0x022f0080 0x80>;
+ clocks = <&clkwdtimer0>;
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH v2 0/6] Update Davinci watchdog driver
2013-11-18 17:18 [PATCH v2 0/6] Update Davinci watchdog driver Ivan Khoronzhuk
` (5 preceding siblings ...)
2013-11-18 17:18 ` [PATCH 6/6] arm: dts: keystone: add watchdog entry Ivan Khoronzhuk
@ 2013-11-25 13:06 ` Sekhar Nori
2013-11-25 13:19 ` ivan.khoronzhuk
6 siblings, 1 reply; 17+ messages in thread
From: Sekhar Nori @ 2013-11-25 13:06 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 18 November 2013 10:48 PM, Ivan Khoronzhuk wrote:
> These patches are intended to update Davinci watchdog to use WDT core
> and reuse driver for keystone arch, because Keystone uses the similar
> IP like Davinci.
This series causes a regression on all DaVinci platforms because after
the series is applied the watchdog device does not get registered at
all. Since you changed the device name please include a patch to fix the
platform references too.
Thanks,
Sekhar
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH v2 0/6] Update Davinci watchdog driver
2013-11-25 13:06 ` [PATCH v2 0/6] Update Davinci watchdog driver Sekhar Nori
@ 2013-11-25 13:19 ` ivan.khoronzhuk
2013-11-25 16:44 ` ivan.khoronzhuk
0 siblings, 1 reply; 17+ messages in thread
From: ivan.khoronzhuk @ 2013-11-25 13:19 UTC (permalink / raw)
To: linux-arm-kernel
On 11/25/2013 03:06 PM, Sekhar Nori wrote:
> On Monday 18 November 2013 10:48 PM, Ivan Khoronzhuk wrote:
>> These patches are intended to update Davinci watchdog to use WDT core
>> and reuse driver for keystone arch, because Keystone uses the similar
>> IP like Davinci.
>
> This series causes a regression on all DaVinci platforms because after
> the series is applied the watchdog device does not get registered at
> all. Since you changed the device name please include a patch to fix the
> platform references too.
>
> Thanks,
> Sekhar
>
Ok, I will replace
--
Regards,
Ivan Khoronzhuk
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 0/6] Update Davinci watchdog driver
2013-11-25 13:19 ` ivan.khoronzhuk
@ 2013-11-25 16:44 ` ivan.khoronzhuk
0 siblings, 0 replies; 17+ messages in thread
From: ivan.khoronzhuk @ 2013-11-25 16:44 UTC (permalink / raw)
To: linux-arm-kernel
On 11/25/2013 03:19 PM, ivan.khoronzhuk wrote:
> On 11/25/2013 03:06 PM, Sekhar Nori wrote:
>> On Monday 18 November 2013 10:48 PM, Ivan Khoronzhuk wrote:
>>> These patches are intended to update Davinci watchdog to use WDT core
>>> and reuse driver for keystone arch, because Keystone uses the similar
>>> IP like Davinci.
>>
>> This series causes a regression on all DaVinci platforms because after
>> the series is applied the watchdog device does not get registered at
>> all. Since you changed the device name please include a patch to fix the
>> platform references too.
>>
>> Thanks,
>> Sekhar
>>
>
> Ok, I will replace
>
Sekhar I have replaced names in new patch seria
https://lkml.org/lkml/2013/11/25/461
at watchdog: davinci: change driver to use WDT core
Is it OK for you?
--
Regards,
Ivan Khoronzhuk
^ permalink raw reply [flat|nested] 17+ messages in thread