diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:45 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:45 +0200 |
commit | 7f9fc3dbd03a8c6211bc92945330e634138db29c (patch) | |
tree | 84b36e9973adb8666aae81e65c8291a8ed48561b /drivers | |
parent | f22d4e27786c8a7f58ef7167f38c3c5dd313d290 (diff) | |
parent | 7d6d7c42dacf5ee9db9f25569ff544ae6603ece1 (diff) | |
download | barebox-7f9fc3dbd03a8c6211bc92945330e634138db29c.tar.gz barebox-7f9fc3dbd03a8c6211bc92945330e634138db29c.tar.xz |
Merge branch 'for-next/watchdog'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/Kconfig | 2 | ||||
-rw-r--r-- | drivers/Makefile | 1 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig | 15 | ||||
-rw-r--r-- | drivers/watchdog/Makefile | 2 | ||||
-rw-r--r-- | drivers/watchdog/im28wd.c | 124 | ||||
-rw-r--r-- | drivers/watchdog/wd_core.c | 57 |
6 files changed, 200 insertions, 1 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index c52c56a56a..089dc3f99b 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -15,7 +15,7 @@ source "drivers/mfd/Kconfig" source "drivers/led/Kconfig" source "drivers/eeprom/Kconfig" source "drivers/input/Kconfig" - +source "drivers/watchdog/Kconfig" source "drivers/pwm/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 3aefc1221d..72c4058fea 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_LED) += led/ obj-y += eeprom/ obj-$(CONFIG_PWM) += pwm/ obj-y += input/ +obj-y += watchdog/ diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig new file mode 100644 index 0000000000..8fdc7a5aa8 --- /dev/null +++ b/drivers/watchdog/Kconfig @@ -0,0 +1,15 @@ +menuconfig WATCHDOG + bool "Watchdog support " + help + Many platforms support a watchdog to keep track of a working machine. + This framework provides routines to handle these watchdogs. + +if WATCHDOG + +config WATCHDOG_MXS28 + bool "i.MX28" + depends on ARCH_IMX28 + help + Add support for watchdog management for the i.MX28 SoC. + +endif diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile new file mode 100644 index 0000000000..b29103b6cc --- /dev/null +++ b/drivers/watchdog/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_WATCHDOG) += wd_core.o +obj-$(CONFIG_WATCHDOG_MXS28) += im28wd.o diff --git a/drivers/watchdog/im28wd.c b/drivers/watchdog/im28wd.c new file mode 100644 index 0000000000..b016910ec9 --- /dev/null +++ b/drivers/watchdog/im28wd.c @@ -0,0 +1,124 @@ +/* + * (c) 2012 Juergen Beisert <kernel@pengutronix.de> + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Note: this driver works for the i.MX28 SoC. It might work for the + * i.MX23 Soc as well, but is not tested yet. + */ + +#include <common.h> +#include <init.h> +#include <io.h> +#include <errno.h> +#include <malloc.h> +#include <watchdog.h> + +#define MXS_RTC_CTRL 0x0 +#define MXS_RTC_SET_ADDR 0x4 +#define MXS_RTC_CLR_ADDR 0x8 +# define MXS_RTC_CTRL_WATCHDOGEN (1 << 4) + +#define MXS_RTC_STAT 0x10 +# define MXS_RTC_STAT_WD_PRESENT (1 << 29) + +#define MXS_RTC_WATCHDOG 0x50 + +#define MXS_RTC_PERSISTENT0 0x60 +/* dubious meaning from inside the SoC's firmware ROM */ +# define MXS_RTC_PERSISTENT0_EXT_RST (1 << 21) +/* dubious meaning from inside the SoC's firmware ROM */ +# define MXS_RTC_PERSISTENT0_THM_RST (1 << 20) + +#define MXS_RTC_PERSISTENT1 0x70 +/* dubious meaning from inside the SoC's firmware ROM */ +# define MXS_RTC_PERSISTENT1_FORCE_UPDATER (1 << 31) + +#define MXS_RTC_DEBUG 0xc0 + +#define WDOG_TICK_RATE 1000 /* the watchdog uses a 1 kHz clock rate */ + +struct imx28_wd { + struct watchdog wd; + void __iomem *regs; +}; + +#define to_imx28_wd(h) container_of(h, struct imx28_wd, wd) + +static int imx28_watchdog_set_timeout(struct watchdog *wd, unsigned timeout) +{ + struct imx28_wd *pwd = (struct imx28_wd *)to_imx28_wd(wd); + void __iomem *base; + + if (timeout > (ULONG_MAX / WDOG_TICK_RATE)) + return -EINVAL; + + if (timeout) { + writel(timeout * WDOG_TICK_RATE, pwd->regs + MXS_RTC_WATCHDOG); + base = pwd->regs + MXS_RTC_SET_ADDR; + } else { + base = pwd->regs + MXS_RTC_CLR_ADDR; + } + writel(MXS_RTC_CTRL_WATCHDOGEN, base + MXS_RTC_CTRL); + writel(MXS_RTC_PERSISTENT1_FORCE_UPDATER, base + MXS_RTC_PERSISTENT1); + + return 0; +} + +static int imx28_wd_probe(struct device_d *dev) +{ + struct imx28_wd *priv; + int rc; + + priv = xzalloc(sizeof(struct imx28_wd)); + priv->regs = dev_request_mem_region(dev, 0); + priv->wd.set_timeout = imx28_watchdog_set_timeout; + + if (!(readl(priv->regs + MXS_RTC_STAT) & MXS_RTC_STAT_WD_PRESENT)) { + rc = -ENODEV; + goto on_error; + } + + /* disable the debug feature to ensure a working WD */ + writel(0x00000000, priv->regs + MXS_RTC_DEBUG); + + rc = watchdog_register(&priv->wd); + if (rc != 0) + goto on_error; + + dev->priv = priv; + return 0; + +on_error: + free(priv); + return rc; +} + +static void imx28_wd_remove(struct device_d *dev) +{ + struct imx28_wd *priv= dev->priv; + watchdog_deregister(&priv->wd); + free(priv); +} + +static struct driver_d imx28_wd_driver = { + .name = "im28wd", + .probe = imx28_wd_probe, + .remove = imx28_wd_remove, +}; + +static int imx28_wd_init(void) +{ + register_driver(&imx28_wd_driver); + return 0; +} + +device_initcall(imx28_wd_init); diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c new file mode 100644 index 0000000000..3d0cfc635d --- /dev/null +++ b/drivers/watchdog/wd_core.c @@ -0,0 +1,57 @@ +/* + * (c) 2012 Juergen Beisert <kernel@pengutronix.de> + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <linux/ctype.h> +#include <watchdog.h> + +/* + * Note: this simple framework supports one watchdog only. + */ +static struct watchdog *watchdog; + +int watchdog_register(struct watchdog *wd) +{ + if (watchdog != NULL) + return -EBUSY; + + watchdog = wd; + return 0; +} +EXPORT_SYMBOL(watchdog_register); + +int watchdog_deregister(struct watchdog *wd) +{ + if (watchdog == NULL || wd != watchdog) + return -ENODEV; + + watchdog = NULL; + return 0; +} +EXPORT_SYMBOL(watchdog_deregister); + +/* + * start, stop or retrigger the watchdog + * timeout in [seconds]. timeout of '0' will disable the watchdog (if possible) + */ +int watchdog_set_timeout(unsigned timeout) +{ + if (watchdog == NULL) + return -ENODEV; + + return watchdog->set_timeout(watchdog, timeout); +} +EXPORT_SYMBOL(watchdog_set_timeout); |