Commit a1b0a006 authored by Linus Torvalds's avatar Linus Torvalds

Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog updates from Wim Van Sebroeck:
 - remove unnecessary checks after platform_get_resource()
 - fix watchdog api documentation typo's
 - imx2_wdt: adds big endianness support
 - move restart code to the sunxi watchdog driver

* git://www.linux-watchdog.org/linux-watchdog:
  wdt: sunxi: Move restart code to the watchdog driver
  Documentation: fix two typos in watchdog-api.txt
  watchdog: imx2_wdt: adds big endianness support.
  watchdog: shwdt: Remove the unnecessary check of resource after platform_get_resource()
  watchdog: lantiq_wdt: Remove the un-necessary check of resource after platform_get_resource()
  watchdog: dw_wdt: Remove the un-necessary check after platform_get_resource()
parents 77251319 440e96bc
...@@ -5,10 +5,15 @@ Required properties: ...@@ -5,10 +5,15 @@ Required properties:
- reg : Should contain WDT registers location and length - reg : Should contain WDT registers location and length
- interrupts : Should contain WDT interrupt - interrupts : Should contain WDT interrupt
Optional property:
- big-endian: If present the watchdog device's registers are implemented
in big endian mode, otherwise in little mode.
Examples: Examples:
wdt@73f98000 { wdt@73f98000 {
compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
reg = <0x73f98000 0x4000>; reg = <0x73f98000 0x4000>;
interrupts = <58>; interrupts = <58>;
big-endian;
}; };
...@@ -118,7 +118,7 @@ resets. ...@@ -118,7 +118,7 @@ resets.
Note that the pretimeout is the number of seconds before the time Note that the pretimeout is the number of seconds before the time
when the timeout will go off. It is not the number of seconds until when the timeout will go off. It is not the number of seconds until
the pretimeout. So, for instance, if you set the timeout to 60 seconds the pretimeout. So, for instance, if you set the timeout to 60 seconds
and the pretimeout to 10 seconds, the pretimout will go of in 50 and the pretimeout to 10 seconds, the pretimeout will go off in 50
seconds. Setting a pretimeout to zero disables it. seconds. Setting a pretimeout to zero disables it.
There is also a get function for getting the pretimeout: There is also a get function for getting the pretimeout:
......
...@@ -296,9 +296,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev) ...@@ -296,9 +296,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
int ret; int ret;
struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem)
return -EINVAL;
dw_wdt.regs = devm_ioremap_resource(&pdev->dev, mem); dw_wdt.regs = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(dw_wdt.regs)) if (IS_ERR(dw_wdt.regs))
return PTR_ERR(dw_wdt.regs); return PTR_ERR(dw_wdt.regs);
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/of_address.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <linux/timer.h> #include <linux/timer.h>
...@@ -190,10 +191,12 @@ static struct regmap_config imx2_wdt_regmap_config = { ...@@ -190,10 +191,12 @@ static struct regmap_config imx2_wdt_regmap_config = {
static int __init imx2_wdt_probe(struct platform_device *pdev) static int __init imx2_wdt_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node;
struct imx2_wdt_device *wdev; struct imx2_wdt_device *wdev;
struct watchdog_device *wdog; struct watchdog_device *wdog;
struct resource *res; struct resource *res;
void __iomem *base; void __iomem *base;
bool big_endian;
int ret; int ret;
u32 val; u32 val;
...@@ -201,6 +204,10 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) ...@@ -201,6 +204,10 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
if (!wdev) if (!wdev)
return -ENOMEM; return -ENOMEM;
big_endian = of_property_read_bool(np, "big-endian");
if (big_endian)
imx2_wdt_regmap_config.val_format_endian = REGMAP_ENDIAN_BIG;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res); base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base)) if (IS_ERR(base))
......
...@@ -192,11 +192,6 @@ ltq_wdt_probe(struct platform_device *pdev) ...@@ -192,11 +192,6 @@ ltq_wdt_probe(struct platform_device *pdev)
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct clk *clk; struct clk *clk;
if (!res) {
dev_err(&pdev->dev, "cannot obtain I/O memory region");
return -ENOENT;
}
ltq_wdt_membase = devm_ioremap_resource(&pdev->dev, res); ltq_wdt_membase = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(ltq_wdt_membase)) if (IS_ERR(ltq_wdt_membase))
return PTR_ERR(ltq_wdt_membase); return PTR_ERR(ltq_wdt_membase);
......
...@@ -230,10 +230,6 @@ static int sh_wdt_probe(struct platform_device *pdev) ...@@ -230,10 +230,6 @@ static int sh_wdt_probe(struct platform_device *pdev)
if (pdev->id != -1) if (pdev->id != -1)
return -EINVAL; return -EINVAL;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (unlikely(!res))
return -EINVAL;
wdt = devm_kzalloc(&pdev->dev, sizeof(struct sh_wdt), GFP_KERNEL); wdt = devm_kzalloc(&pdev->dev, sizeof(struct sh_wdt), GFP_KERNEL);
if (unlikely(!wdt)) if (unlikely(!wdt))
return -ENOMEM; return -ENOMEM;
...@@ -249,6 +245,7 @@ static int sh_wdt_probe(struct platform_device *pdev) ...@@ -249,6 +245,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
wdt->clk = NULL; wdt->clk = NULL;
} }
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
wdt->base = devm_ioremap_resource(wdt->dev, res); wdt->base = devm_ioremap_resource(wdt->dev, res);
if (IS_ERR(wdt->base)) if (IS_ERR(wdt->base))
return PTR_ERR(wdt->base); return PTR_ERR(wdt->base);
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
*/ */
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/io.h> #include <linux/io.h>
...@@ -22,9 +23,12 @@ ...@@ -22,9 +23,12 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reboot.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <asm/system_misc.h>
#define WDT_MAX_TIMEOUT 16 #define WDT_MAX_TIMEOUT 16
#define WDT_MIN_TIMEOUT 1 #define WDT_MIN_TIMEOUT 1
#define WDT_MODE_TIMEOUT(n) ((n) << 3) #define WDT_MODE_TIMEOUT(n) ((n) << 3)
...@@ -70,6 +74,26 @@ static const int wdt_timeout_map[] = { ...@@ -70,6 +74,26 @@ static const int wdt_timeout_map[] = {
[16] = 0xB, /* 16s */ [16] = 0xB, /* 16s */
}; };
static void __iomem *reboot_wdt_base;
static void sun4i_wdt_restart(enum reboot_mode mode, const char *cmd)
{
/* Enable timer and set reset bit in the watchdog */
writel(WDT_MODE_EN | WDT_MODE_RST_EN, reboot_wdt_base + WDT_MODE);
/*
* Restart the watchdog. The default (and lowest) interval
* value for the watchdog is 0.5s.
*/
writel(WDT_CTRL_RELOAD, reboot_wdt_base + WDT_CTRL);
while (1) {
mdelay(5);
writel(WDT_MODE_EN | WDT_MODE_RST_EN,
reboot_wdt_base + WDT_MODE);
}
}
static int sunxi_wdt_ping(struct watchdog_device *wdt_dev) static int sunxi_wdt_ping(struct watchdog_device *wdt_dev)
{ {
struct sunxi_wdt_dev *sunxi_wdt = watchdog_get_drvdata(wdt_dev); struct sunxi_wdt_dev *sunxi_wdt = watchdog_get_drvdata(wdt_dev);
...@@ -181,6 +205,9 @@ static int sunxi_wdt_probe(struct platform_device *pdev) ...@@ -181,6 +205,9 @@ static int sunxi_wdt_probe(struct platform_device *pdev)
if (unlikely(err)) if (unlikely(err))
return err; return err;
reboot_wdt_base = sunxi_wdt->wdt_base;
arm_pm_restart = sun4i_wdt_restart;
dev_info(&pdev->dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)", dev_info(&pdev->dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)",
sunxi_wdt->wdt_dev.timeout, nowayout); sunxi_wdt->wdt_dev.timeout, nowayout);
...@@ -191,6 +218,8 @@ static int sunxi_wdt_remove(struct platform_device *pdev) ...@@ -191,6 +218,8 @@ static int sunxi_wdt_remove(struct platform_device *pdev)
{ {
struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev); struct sunxi_wdt_dev *sunxi_wdt = platform_get_drvdata(pdev);
arm_pm_restart = NULL;
watchdog_unregister_device(&sunxi_wdt->wdt_dev); watchdog_unregister_device(&sunxi_wdt->wdt_dev);
watchdog_set_drvdata(&sunxi_wdt->wdt_dev, NULL); watchdog_set_drvdata(&sunxi_wdt->wdt_dev, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment