watchdog: Add DA9063 PMIC watchdog driver.
Subsystems (2)
PATCH v7 1/1 watchdog: Add DA9063 PMIC watchdog driver.
From: Krystian Garbaciak <[email protected]>
This driver supports the watchdog device inside the DA9063 PMIC.
---
Notes:
Changes in v7:
- Remove unnecessary range checks
- Realign line breaks
- Cleanup use of unsigned int for selector and timeouts
Changes in v6:
- Fix compile error
Changes in v5:
- Kconfig: Add note about the module name.
- Change selector variables to int
- Style fixes
- use unsigned int to remove gcc verbose warning
- Integrate _kick() and _disable() into the calling functions
Changes in v4:
- Fixed indentation
- Fixed lock without unlock
- Check for parent device and device driver data in probe(). If not present, this is an invalid prober initialization, return -EINVAL.
Changes in v3:
- Cleanup error handling for timeout selection and setting
- Fix race condition due to late wdt drvdata setup
- Remove static struct watchdog_device. It is not initialized in the probe function
- Use WATCHDOG_NOWAYOUT_INIT_STATUS for the status
- Remove 0 shift using DA9063_TWDSCALE_SHIFT
drivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/da9063_wdt.c | 191 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 drivers/watchdog/da9063_wdt.c
drivers/watchdog/Kconfig +9 -0
@@ -87,6 +87,15 @@ config DA9055_WATCHDOG This driver can also be built as a module. If so, the module will be called da9055_wdt. +config DA9063_WATCHDOG + tristate "Dialog DA9063 Watchdog" + depends on MFD_DA9063 + select WATCHDOG_CORE + help + Support for the watchdog in the DA9063 PMIC. + + This driver can be built as a module. The module name is da9063_wdt. + config GPIO_WATCHDOG tristate "Watchdog device controlled through GPIO-line" depends on OF_GPIO
drivers/watchdog/Makefile +1 -0
@@ -173,6 +173,7 @@ obj-$(CONFIG_XEN_WDT) += xen_wdt.o # Architecture Independent obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o obj-$(CONFIG_DA9055_WATCHDOG) += da9055_wdt.o +obj-$(CONFIG_DA9063_WATCHDOG) += da9063_wdt.o obj-$(CONFIG_GPIO_WATCHDOG) += gpio_wdt.o obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.o
drivers/watchdog/da9063_wdt.c new file +191 -0
191 lines not on this page · raw message
Signature · 1 line
2.1.0
Guenter Roeck
maintainerPATCH v7 1/1 watchdog: Add DA9063 PMIC watchdog driver.
Quoted 7 lines · Markus Pargmann
From: Krystian Garbaciak <[email protected]>
This driver supports the watchdog device inside the DA9063 PMIC.
Signed-off-by Krystian Garbaciak <[email protected]>Signed-off-by Philipp Zabel <[email protected]>Signed-off-by Markus Pargmann <[email protected]>
Thanks for your patience,
Guenter
Quoted 268 lines
---
Notes:
Changes in v7:
- Remove unnecessary range checks
- Realign line breaks
- Cleanup use of unsigned int for selector and timeoutsChanges in v6:
- Fix compile errorChanges in v5:
-Kconfig: Add note about the module name.
- Change selector variables to int
- Style fixes
- use unsigned int to remove gcc verbose warning
- Integrate_kick()and_disable()into the calling functionsChanges in v4:
- Fixed indentation
- Fixed lock without unlock
- Check for parent device and device driver data inprobe(). If not present, this is an invalid prober initialization, return-EINVAL.Changes in v3:
- Cleanup error handling for timeout selection and setting
- Fix race condition due to late wdt drvdata setup
- Remove static structwatchdog_device. It is not initialized in the probe function
- UseWATCHDOG_NOWAYOUT_INIT_STATUSfor the status
- Remove 0 shift usingDA9063_TWDSCALE_SHIFTdrivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/da9063_wdt.c | 191 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+)create mode 100644
drivers/watchdog/da9063_wdt.cdrivers/watchdog/Kconfig +9
-0@@ -87,6 +87,15 @@ config DA9055_WATCHDOG This driver can also be built as a module. If so, the module will be called da9055_wdt. +config DA9063_WATCHDOG + tristate "Dialog DA9063 Watchdog" + depends on MFD_DA9063 + select WATCHDOG_CORE + help + Support for the watchdog in the DA9063 PMIC. + + This driver can be built as a module. The module name is da9063_wdt. + config GPIO_WATCHDOG tristate "Watchdog device controlled through GPIO-line" depends on OF_GPIOdrivers/watchdog/Makefile +1
-0@@ -173,6 +173,7 @@ obj-$(CONFIG_XEN_WDT) += xen_wdt.o # Architecture Independent obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o obj-$(CONFIG_DA9055_WATCHDOG) += da9055_wdt.o +obj-$(CONFIG_DA9063_WATCHDOG) += da9063_wdt.o obj-$(CONFIG_GPIO_WATCHDOG) += gpio_wdt.o obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.odrivers/watchdog/da9063_wdt.c new file +191
-0@@ -0,0 +1,191 @@ +/* +* Watchdog driver for DA9063 PMICs. +* +* Copyright(c) 2012 Dialog Semiconductor Ltd. +* +* Author: Mariusz Wojtasik <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +*/ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/watchdog.h> +#include <linux/platform_device.h> +#include <linux/uaccess.h> +#include <linux/slab.h> +#include <linux/delay.h> +#include <linux/mfd/da9063/registers.h> +#include <linux/mfd/da9063/core.h> +#include <linux/regmap.h> + +/* +* Watchdog selector to timeout in seconds. +* 0: WDT disabled; +* others: timeout = 2048 ms * 2^(TWDSCALE-1). +*/ +static const unsigned int wdt_timeout[] = {0 ,2 ,4 ,8 ,16 ,32 ,65 ,131 }; +#define DA9063_TWDSCALE_DISABLE 0 +#define DA9063_TWDSCALE_MIN 1 +#define DA9063_TWDSCALE_MAX (ARRAY_SIZE(wdt_timeout) - 1) +#define DA9063_WDT_MIN_TIMEOUT wdt_timeout[DA9063_TWDSCALE_MIN] +#define DA9063_WDT_MAX_TIMEOUT wdt_timeout[DA9063_TWDSCALE_MAX] +#define DA9063_WDG_TIMEOUT wdt_timeout[3] + +struct da9063_watchdog { +struct da9063 *da9063; +struct watchdog_device wdtdev; +}; + +static unsigned int da9063_wdt_timeout_to_sel (unsigned int secs) +{ +unsigned int i; + +for (i =DA9063_TWDSCALE_MIN ; i <=DA9063_TWDSCALE_MAX ; i++) { +if (wdt_timeout[i] >= secs) +return i; + } + +return DA9063_TWDSCALE_MAX ; +} + +static int _da9063_wdt_set_timeout (struct da9063 *da9063,unsigned int regval) +{ +return regmap_update_bits (da9063->regmap,DA9063_REG_CONTROL_D , +DA9063_TWDSCALE_MASK , regval); +} + +static int da9063_wdt_start (struct watchdog_device *wdd) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +unsigned int selector; +int ret; + + selector =da9063_wdt_timeout_to_sel (wdt->wdtdev.timeout); + ret =_da9063_wdt_set_timeout (wdt->da9063, selector); +if (ret) +dev_err (wdt->da9063->dev,"Watchdog failed to start (err = %d)\n" , + ret); + +return ret; +} + +static int da9063_wdt_stop (struct watchdog_device *wdd) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +int ret; + + ret =regmap_update_bits (wdt->da9063->regmap,DA9063_REG_CONTROL_D , +DA9063_TWDSCALE_MASK ,DA9063_TWDSCALE_DISABLE ); +if (ret) +dev_alert (wdt->da9063->dev,"Watchdog failed to stop (err = %d)\n" , + ret); + +return ret; +} + +static int da9063_wdt_ping (struct watchdog_device *wdd) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +int ret; + + ret =regmap_write (wdt->da9063->regmap,DA9063_REG_CONTROL_F , +DA9063_WATCHDOG ); +if (ret) +dev_alert (wdt->da9063->dev,"Failed to ping the watchdog (err = %d)\n" , + ret); + +return ret; +} + +static int da9063_wdt_set_timeout (struct watchdog_device *wdd, +unsigned int timeout) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +unsigned int selector; +int ret; + + selector =da9063_wdt_timeout_to_sel (timeout); + ret =_da9063_wdt_set_timeout (wdt->da9063, selector); +if (ret) +dev_err (wdt->da9063->dev,"Failed to set watchdog timeout (err = %d)\n" , + ret); +else + wdd->timeout = wdt_timeout[selector]; + +return ret; +} + +static const struct watchdog_info da9063_watchdog_info = { + .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , + .identity ="DA9063 Watchdog" , +}; + +static const struct watchdog_ops da9063_watchdog_ops = { + .owner =THIS_MODULE , + .start = da9063_wdt_start, + .stop = da9063_wdt_stop, + .ping = da9063_wdt_ping, + .set_timeout = da9063_wdt_set_timeout, +}; + +static int da9063_wdt_probe (struct platform_device *pdev) +{ +int ret; +struct da9063 *da9063; +struct da9063_watchdog *wdt; + +if (!pdev->dev.parent) +return -EINVAL ; + + da9063 =dev_get_drvdata (pdev->dev.parent); +if (!da9063) +return -EINVAL ; + + wdt =devm_kzalloc (&pdev->dev,sizeof (*wdt),GFP_KERNEL ); +if (!wdt) +return -ENOMEM ; + + wdt->da9063 = da9063; + + wdt->wdtdev.info = &da9063_watchdog_info; + wdt->wdtdev.ops = &da9063_watchdog_ops; + wdt->wdtdev.min_timeout =DA9063_WDT_MIN_TIMEOUT ; + wdt->wdtdev.max_timeout =DA9063_WDT_MAX_TIMEOUT ; + wdt->wdtdev.timeout =DA9063_WDG_TIMEOUT ; + + wdt->wdtdev.status =WATCHDOG_NOWAYOUT_INIT_STATUS ; + +watchdog_set_drvdata (&wdt->wdtdev, wdt); +dev_set_drvdata (&pdev->dev, wdt); + + ret =watchdog_register_device (&wdt->wdtdev); + +return ret; +} + +static int da9063_wdt_remove (struct platform_device *pdev) +{ +struct da9063_watchdog *wdt =dev_get_drvdata (&pdev->dev); + +watchdog_unregister_device (&wdt->wdtdev); + +return 0 ; +} + +static struct platform_driver da9063_wdt_driver = { + .probe = da9063_wdt_probe, + .remove = da9063_wdt_remove, + .driver = { + .name =DA9063_DRVNAME_WATCHDOG , + }, +}; +module_platform_driver (da9063_wdt_driver); + +MODULE_AUTHOR ("Mariusz Wojtasik <[email protected]>" ); +MODULE_DESCRIPTION ("Watchdog driver for Dialog DA9063" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:" DA9063_DRVNAME_WATCHDOG );
PATCH v7 1/1 watchdog: Add DA9063 PMIC watchdog driver.
Quoted 10 lines · Guenter Roeck
Quoted 7 lines · Markus Pargmann
From: Krystian Garbaciak <[email protected]>
This driver supports the watchdog device inside the DA9063 PMIC.
Signed-off-by Krystian Garbaciak <[email protected]>Signed-off-by Philipp Zabel <[email protected]>Signed-off-by Markus Pargmann <[email protected]>Reviewed-by Guenter Roeck <[email protected]>
Thanks for your reviews.
Best regards,
Markus
Signature · 11 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140928/a5b34896/attachment.sig>
PATCH v7 1/1 watchdog: Add DA9063 PMIC watchdog driver.
In reply to Markus PargmannQuoted 9 lines · On 28 September 2014 18:06 Markus Pargmann wrote:
From: Krystian Garbaciak <[email protected]>
This driver supports the watchdog device inside the DA9063 PMIC.
Signed-off-by Krystian Garbaciak <[email protected]>Signed-off-by Philipp Zabel <[email protected]>Signed-off-by Markus Pargmann <[email protected]>---
Thank you Markus,
I'll get a reply back to you as soon as I can ...
Regards,
Steve
PATCH v7 1/1 watchdog: Add DA9063 PMIC watchdog driver.
In reply to Markus PargmannQuoted 7 lines · Markus Pargmann
From: Krystian Garbaciak <[email protected]>
This driver supports the watchdog device inside the DA9063 PMIC.
Signed-off-by Krystian Garbaciak <[email protected]>Signed-off-by Philipp Zabel <[email protected]>Signed-off-by Markus Pargmann <[email protected]>
Best regards,
Steve
Quoted 283 lines
---
Notes:
Changes in v7:
- Remove unnecessary range checks
- Realign line breaks
- Cleanup use of unsigned int for selector and timeoutsChanges in v6:
- Fix compile errorChanges in v5:
-Kconfig: Add note about the module name.
- Change selector variables to int
- Style fixes
- use unsigned int to remove gcc verbose warning
- Integrate_kick()and_disable()into the calling functionsChanges in v4:
- Fixed indentation
- Fixed lock without unlock
- Check for parent device and device driver data inprobe(). If not present, this is an invalid prober initialization, return-EINVAL.Changes in v3:
- Cleanup error handling for timeout selection and setting
- Fix race condition due to late wdt drvdata setup
- Remove static structwatchdog_device. It is not initialized in the probe function
- UseWATCHDOG_NOWAYOUT_INIT_STATUSfor the status
- Remove 0 shift usingDA9063_TWDSCALE_SHIFTdrivers/watchdog/Kconfig | 9 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/da9063_wdt.c | 191 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+) create mode 100644 drivers/watchdog/da9063_wdt.cdrivers/watchdog/Kconfig +8
-0@@ -87,6 +87,15 @@ config DA9055_WATCHDOG This driver can also be built as a module. If so, the module will be called da9055_wdt. +config DA9063_WATCHDOG + tristate "Dialog DA9063 Watchdog" + depends on MFD_DA9063 + select WATCHDOG_CORE + help + Support for the watchdog in the DA9063 PMIC. + + This driver can be built as a module. The module name is
da9063_wdt.drivers/watchdog/Kconfig +1
-0+ config GPIO_WATCHDOG tristate "Watchdog device controlled through GPIO-line" depends on OF_GPIOdrivers/watchdog/Makefile +1
-0@@ -173,6 +173,7 @@ obj-$(CONFIG_XEN_WDT) += xen_wdt.o # Architecture Independent obj-$(CONFIG_DA9052_WATCHDOG) += da9052_wdt.o obj-$(CONFIG_DA9055_WATCHDOG) += da9055_wdt.o +obj-$(CONFIG_DA9063_WATCHDOG) += da9063_wdt.o obj-$(CONFIG_GPIO_WATCHDOG) += gpio_wdt.o obj-$(CONFIG_WM831X_WATCHDOG) += wm831x_wdt.o obj-$(CONFIG_WM8350_WATCHDOG) += wm8350_wdt.odrivers/watchdog/da9063_wdt.c new file +33
-0@@ -0,0 +1,191 @@ +/* +* Watchdog driver for DA9063 PMICs. +* +* Copyright(c) 2012 Dialog Semiconductor Ltd. +* +* Author: Mariusz Wojtasik <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +*/ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/watchdog.h> +#include <linux/platform_device.h> +#include <linux/uaccess.h> +#include <linux/slab.h> +#include <linux/delay.h> +#include <linux/mfd/da9063/registers.h> +#include <linux/mfd/da9063/core.h> +#include <linux/regmap.h> + +/* +* Watchdog selector to timeout in seconds. +* 0: WDT disabled; +* others: timeout = 2048 ms * 2^(TWDSCALE-1). +*/ +static const unsigned int wdt_timeout[] = {0 ,2 ,4 ,8 ,16 ,32 ,65 ,131 }; +#define DA9063_TWDSCALE_DISABLE 0 +#define DA9063_TWDSCALE_MIN 1 +#define DA9063_TWDSCALE_MAX (ARRAY_SIZE(wdt_timeout) -1)
+#defineDA9063_WDT_MIN_TIMEOUTwdt_timeout[DA9063_TWDSCALE_MIN] +#define DA9063_WDT_MAX_TIMEOUT wdt_timeout[DA9063_TWDSCALE_MAX]drivers/watchdog/da9063_wdt.c new file +12
-0+#define DA9063_WDG_TIMEOUT wdt_timeout[3] + +struct da9063_watchdog { +struct da9063 *da9063; +struct watchdog_device wdtdev; +}; + +static unsigned int da9063_wdt_timeout_to_sel (unsigned int secs) +{ +unsigned int i; + +for (i =DA9063_TWDSCALE_MIN ; i <=DA9063_TWDSCALE_MAX ; i++){
drivers/watchdog/da9063_wdt.c new file +8
-0+if (wdt_timeout[i] >= secs) +return i; + } + +return DA9063_TWDSCALE_MAX ; +} + +static int _da9063_wdt_set_timeout(struct da9063 *da9063, unsigned intregval)
drivers/watchdog/da9063_wdt.c new file +2
-0+{ + return regmap_update_bits(da9063->regmap,
DA9063_REG_CONTROL_D,drivers/watchdog/da9063_wdt.c new file +13
-0+ DA9063_TWDSCALE_MASK, regval); +} + +static int da9063_wdt_start (struct watchdog_device *wdd) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +unsigned int selector; +int ret; + + selector =da9063_wdt_timeout_to_sel (wdt->wdtdev.timeout); + ret =_da9063_wdt_set_timeout (wdt->da9063, selector); +if (ret) + dev_err(wdt->da9063->dev, "Watchdog failed to start (err =%d)\n",
drivers/watchdog/da9063_wdt.c new file +11
-0+ ret); + +return ret; +} + +static int da9063_wdt_stop (struct watchdog_device *wdd) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +int ret; + + ret = regmap_update_bits(wdt->da9063->regmap,
DA9063_REG_CONTROL_D,drivers/watchdog/da9063_wdt.c new file +1
-0+ DA9063_TWDSCALE_MASK,
DA9063_TWDSCALE_DISABLE);drivers/watchdog/da9063_wdt.c new file +2
-0+if (ret) + dev_alert(wdt->da9063->dev, "Watchdog failed to stop (err= %d)\n",
drivers/watchdog/da9063_wdt.c new file +11
-0+ ret); + +return ret; +} + +static int da9063_wdt_ping (struct watchdog_device *wdd) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +int ret; + + ret = regmap_write(wdt->da9063->regmap,
DA9063_REG_CONTROL_F,drivers/watchdog/da9063_wdt.c new file +3
-0+ DA9063_WATCHDOG); +if (ret) + dev_alert(wdt->da9063->dev, "Failed to ping the watchdog(err = %d)\n",
drivers/watchdog/da9063_wdt.c new file +16
-0+ ret); + +return ret; +} + +static int da9063_wdt_set_timeout (struct watchdog_device *wdd, +unsigned int timeout) +{ +struct da9063_watchdog *wdt =watchdog_get_drvdata (wdd); +unsigned int selector; +int ret; + + selector =da9063_wdt_timeout_to_sel (timeout); + ret =_da9063_wdt_set_timeout (wdt->da9063, selector); +if (ret) + dev_err(wdt->da9063->dev, "Failed to set watchdog timeout(err = %d)\n",
drivers/watchdog/da9063_wdt.c new file +77
-0+ ret); + else + wdd->timeout = wdt_timeout[selector]; + +return ret; +} + +static const struct watchdog_info da9063_watchdog_info = { + .options =WDIOF_SETTIMEOUT |WDIOF_KEEPALIVEPING , + .identity ="DA9063 Watchdog" , +}; + +static const struct watchdog_ops da9063_watchdog_ops = { + .owner =THIS_MODULE , + .start = da9063_wdt_start, + .stop = da9063_wdt_stop, + .ping = da9063_wdt_ping, + .set_timeout = da9063_wdt_set_timeout, +}; + +static int da9063_wdt_probe (struct platform_device *pdev) +{ +int ret; +struct da9063 *da9063; +struct da9063_watchdog *wdt; + +if (!pdev->dev.parent) +return -EINVAL ; + + da9063 =dev_get_drvdata (pdev->dev.parent); +if (!da9063) +return -EINVAL ; + + wdt =devm_kzalloc (&pdev->dev,sizeof (*wdt),GFP_KERNEL ); +if (!wdt) +return -ENOMEM ; + + wdt->da9063 = da9063; + + wdt->wdtdev.info = &da9063_watchdog_info; + wdt->wdtdev.ops = &da9063_watchdog_ops; + wdt->wdtdev.min_timeout =DA9063_WDT_MIN_TIMEOUT ; + wdt->wdtdev.max_timeout =DA9063_WDT_MAX_TIMEOUT ; + wdt->wdtdev.timeout =DA9063_WDG_TIMEOUT ; + + wdt->wdtdev.status =WATCHDOG_NOWAYOUT_INIT_STATUS ; + +watchdog_set_drvdata (&wdt->wdtdev, wdt); +dev_set_drvdata (&pdev->dev, wdt); + + ret =watchdog_register_device (&wdt->wdtdev); + +return ret; +} + +static int da9063_wdt_remove (struct platform_device *pdev) +{ +struct da9063_watchdog *wdt =dev_get_drvdata (&pdev->dev); + +watchdog_unregister_device (&wdt->wdtdev); + +return 0 ; +} + +static struct platform_driver da9063_wdt_driver = { + .probe = da9063_wdt_probe, + .remove = da9063_wdt_remove, + .driver = { + .name =DA9063_DRVNAME_WATCHDOG , + }, +}; +module_platform_driver (da9063_wdt_driver); + +MODULE_AUTHOR ("Mariusz Wojtasik <[email protected]>" ); +MODULE_DESCRIPTION ("Watchdog driver for Dialog DA9063" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:" DA9063_DRVNAME_WATCHDOG );