Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Friday 31 May 2013 10:58:48 Johannes Thumshirn wrote: > This patch adds the driver for the watchdog devices found on MEN Mikro > Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the > watchdog framework. > It seems the DT support is rather incomplete > Signed-off-by: Johannes Thumshirn > --- > MAINTAINERS |6 ++ > drivers/watchdog/Kconfig |8 ++ > drivers/watchdog/Makefile |1 + Please add a binding document to Documentation/devicetree/bindings/ > + > +#define GPIO_WD_ENAB 169 > +#define GPIO_WD_FAST 170 > +#define GPIO_WD_TRIG 171 > + > +#define GPIO_RST_CAUSE_BASE 166 You should never hardwire GPIO numbers like this. There is a DT binding for GPIO, so use that to get the number of the tree. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Friday 31 May 2013 10:58:48 Johannes Thumshirn wrote: This patch adds the driver for the watchdog devices found on MEN Mikro Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the watchdog framework. It seems the DT support is rather incomplete Signed-off-by: Johannes Thumshirn johannes.thumsh...@men.de --- MAINTAINERS |6 ++ drivers/watchdog/Kconfig |8 ++ drivers/watchdog/Makefile |1 + Please add a binding document to Documentation/devicetree/bindings/ + +#define GPIO_WD_ENAB 169 +#define GPIO_WD_FAST 170 +#define GPIO_WD_TRIG 171 + +#define GPIO_RST_CAUSE_BASE 166 You should never hardwire GPIO numbers like this. There is a DT binding for GPIO, so use that to get the number of the tree. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Fri, May 31, 2013 at 03:36:54AM -0700, Guenter Roeck wrote:
> On Fri, May 31, 2013 at 10:58:48AM +0200, Johannes Thumshirn wrote:
> > This patch adds the driver for the watchdog devices found on MEN Mikro
> > Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
> > watchdog framework.
> >
> > Revision 2:
> > * Removed unneeded open flag in struct a21_wdt_drv
> > * Corrected 3bit reason code from gpio
> > * Additional sysfs files are now part of watchdog sysfs
> > * Changed OFF/ON delay in ping from 400ms to 10ns
> > * Reworked timeout setting
> > * Removed a21_wdt_ioctl(...)
> >
> > Revision 3:
> > * Changed pr_{err,info} to dev_{err,info}
> > * Removed out of memory error print
> > * Transition from "fast" to "slow" mode not allowed by chip
> >
> > Revision 4:
> > * Remove reboot_notifier and place disable code into platform_device's
> > shutdown function
> > * Removed sysfs interface
> >
> > Revision 5:
> >
> > * Added setting of .bootstatus on driver init
> > * Added initial timeout on driver init
> >
> > Signed-off-by: Johannes Thumshirn
> > ---
> > MAINTAINERS |6 ++
> > drivers/watchdog/Kconfig |8 ++
> > drivers/watchdog/Makefile |1 +
> > drivers/watchdog/mena21_wdt.c | 234
> > +
> > 4 files changed, 249 insertions(+)
> > create mode 100644 drivers/watchdog/mena21_wdt.c
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 7714c3c..023945a 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -5307,6 +5307,12 @@ F: drivers/mtd/
> > F: include/linux/mtd/
> > F: include/uapi/mtd/
> >
> > +MEN A21 WATCHDOG DRIVER
> > +M: Johannes Thumshirn
> > +L: linux-watch...@vger.kernel.org
> > +S: Supported
> > +F: drivers/watchdog/mena21_wdt.c
> > +
> > METAG ARCHITECTURE
> > M: James Hogan
> > S: Supported
> > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > index e89fc31..192b84d 100644
> > --- a/drivers/watchdog/Kconfig
> > +++ b/drivers/watchdog/Kconfig
> > @@ -1172,6 +1172,14 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
> >
> > The value can be overridden by the wdt_period command-line parameter.
> >
> > +config MEN_A21_WDT
> > + tristate "MEN A21 VME CPU Carrier Board Watchdog Timer"
> > + select WATCHDOG_CORE
> > + help
> > +Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.
> > +
> > + If unsure select N here.
> > +
> > # PPC64 Architecture
> >
> > config WATCHDOG_RTAS
> > diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> > index a300b94..bffdcb1 100644
> > --- a/drivers/watchdog/Makefile
> > +++ b/drivers/watchdog/Makefile
> > @@ -143,6 +143,7 @@ obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
> > obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
> > obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
> > obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
> > +obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
> >
> > # PPC64 Architecture
> > obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
> > diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
> > new file mode 100644
> > index 000..e586c2e
> > --- /dev/null
> > +++ b/drivers/watchdog/mena21_wdt.c
> > @@ -0,0 +1,234 @@
> > +/*
> > + * Watchdog driver for the A21 VME CPU Boards
> > + *
> > + * Copyright (C) 2013 MEN Mikro Elektronik Nuernberg GmbH
> > + *
> > + * 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
> > + */
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +#include
> > +
> > +#define GPIO_WD_ENAB 169
> > +#define GPIO_WD_FAST 170
> > +#define GPIO_WD_TRIG 171
> > +
> > +#define GPIO_RST_CAUSE_BASE 166
> > +
> > +struct a21_wdt_drv {
> > + struct watchdog_device wdt;
> > + struct mutex lock;
> > +};
> > +
> > +static bool nowayout = WATCHDOG_NOWAYOUT;
> > +module_param(nowayout, bool, 0);
> > +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started
> > (default="
> > + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> > +
> > +static int a21_wdt_get_bootstatus(unsigned int *reset)
> > +{
> > + int i;
> > +
> > + for (i = 0; i < 3; i++)
> > + *reset |= gpio_get_value(GPIO_RST_CAUSE_BASE + i)
> > + ? (1 << i) : 0;
> > +
> > + if (*reset >= 8)
> > + return -EINVAL;
> > +
> > + return 0;
> > +}
> > +
> > +static int a21_wdt_start(struct watchdog_device *wdt)
> > +{
> > + struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
> > +
> > + mutex_lock(>lock);
> > +
> > + gpio_set_value(GPIO_WD_ENAB, 1);
> > +
> > + mutex_unlock(>lock);
> > +
> > + return 0;
> > +}
> > +
> > +static int a21_wdt_stop(struct watchdog_device *wdt)
> > +{
> > + struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
> > +
> > + /* We don't stop if
Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Fri, May 31, 2013 at 10:58:48AM +0200, Johannes Thumshirn wrote:
> This patch adds the driver for the watchdog devices found on MEN Mikro
> Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
> watchdog framework.
>
> Revision 2:
> * Removed unneeded open flag in struct a21_wdt_drv
> * Corrected 3bit reason code from gpio
> * Additional sysfs files are now part of watchdog sysfs
> * Changed OFF/ON delay in ping from 400ms to 10ns
> * Reworked timeout setting
> * Removed a21_wdt_ioctl(...)
>
> Revision 3:
> * Changed pr_{err,info} to dev_{err,info}
> * Removed out of memory error print
> * Transition from "fast" to "slow" mode not allowed by chip
>
> Revision 4:
> * Remove reboot_notifier and place disable code into platform_device's
> shutdown function
> * Removed sysfs interface
>
> Revision 5:
>
> * Added setting of .bootstatus on driver init
> * Added initial timeout on driver init
>
> Signed-off-by: Johannes Thumshirn
> ---
> MAINTAINERS |6 ++
> drivers/watchdog/Kconfig |8 ++
> drivers/watchdog/Makefile |1 +
> drivers/watchdog/mena21_wdt.c | 234
> +
> 4 files changed, 249 insertions(+)
> create mode 100644 drivers/watchdog/mena21_wdt.c
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7714c3c..023945a 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5307,6 +5307,12 @@ F: drivers/mtd/
> F: include/linux/mtd/
> F: include/uapi/mtd/
>
> +MEN A21 WATCHDOG DRIVER
> +M: Johannes Thumshirn
> +L: linux-watch...@vger.kernel.org
> +S: Supported
> +F: drivers/watchdog/mena21_wdt.c
> +
> METAG ARCHITECTURE
> M: James Hogan
> S: Supported
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index e89fc31..192b84d 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -1172,6 +1172,14 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
>
> The value can be overridden by the wdt_period command-line parameter.
>
> +config MEN_A21_WDT
> + tristate "MEN A21 VME CPU Carrier Board Watchdog Timer"
> + select WATCHDOG_CORE
> + help
> +Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.
> +
> + If unsure select N here.
> +
> # PPC64 Architecture
>
> config WATCHDOG_RTAS
> diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
> index a300b94..bffdcb1 100644
> --- a/drivers/watchdog/Makefile
> +++ b/drivers/watchdog/Makefile
> @@ -143,6 +143,7 @@ obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
> obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
> obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
> obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
> +obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
>
> # PPC64 Architecture
> obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
> diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
> new file mode 100644
> index 000..e586c2e
> --- /dev/null
> +++ b/drivers/watchdog/mena21_wdt.c
> @@ -0,0 +1,234 @@
> +/*
> + * Watchdog driver for the A21 VME CPU Boards
> + *
> + * Copyright (C) 2013 MEN Mikro Elektronik Nuernberg GmbH
> + *
> + * 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
> + */
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#define GPIO_WD_ENAB 169
> +#define GPIO_WD_FAST 170
> +#define GPIO_WD_TRIG 171
> +
> +#define GPIO_RST_CAUSE_BASE 166
> +
> +struct a21_wdt_drv {
> + struct watchdog_device wdt;
> + struct mutex lock;
> +};
> +
> +static bool nowayout = WATCHDOG_NOWAYOUT;
> +module_param(nowayout, bool, 0);
> +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started
> (default="
> + __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
> +
> +static int a21_wdt_get_bootstatus(unsigned int *reset)
> +{
> + int i;
> +
> + for (i = 0; i < 3; i++)
> + *reset |= gpio_get_value(GPIO_RST_CAUSE_BASE + i)
> + ? (1 << i) : 0;
> +
> + if (*reset >= 8)
> + return -EINVAL;
> +
> + return 0;
> +}
> +
> +static int a21_wdt_start(struct watchdog_device *wdt)
> +{
> + struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
> +
> + mutex_lock(>lock);
> +
> + gpio_set_value(GPIO_WD_ENAB, 1);
> +
> + mutex_unlock(>lock);
> +
> + return 0;
> +}
> +
> +static int a21_wdt_stop(struct watchdog_device *wdt)
> +{
> + struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
> +
> + /* We don't stop if WDOG_NO_WAY_OUT is set */
> + if (test_bit(WDOG_NO_WAY_OUT, >status))
> + return -EINVAL;
> +
> + mutex_lock(>lock);
> +
> + gpio_set_value(GPIO_WD_ENAB, 0);
> +
> + mutex_unlock(>lock);
> +
> + return 0;
> +}
> +
> +static int a21_wdt_ping(struct watchdog_device *wdt)
> +{
> + struct a21_wdt_drv *drv =
Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Fri, May 31, 2013 at 10:58:48AM +0200, Johannes Thumshirn wrote:
> This patch adds the driver for the watchdog devices found on MEN Mikro
> Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
> watchdog framework.
[...]
> +MODULE_DESCRIPTION("MEN A21 Watchdog");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:a21-watchdog");
> --
> 1.7.9.5
>
Args, sorry messed up the thread :-(.
I'm not so firm with using mutt for patches, but git send-email doesn't seem
to like Exchange here...
Johannes
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
This patch adds the driver for the watchdog devices found on MEN Mikro
Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
watchdog framework.
Revision 2:
* Removed unneeded open flag in struct a21_wdt_drv
* Corrected 3bit reason code from gpio
* Additional sysfs files are now part of watchdog sysfs
* Changed OFF/ON delay in ping from 400ms to 10ns
* Reworked timeout setting
* Removed a21_wdt_ioctl(...)
Revision 3:
* Changed pr_{err,info} to dev_{err,info}
* Removed out of memory error print
* Transition from "fast" to "slow" mode not allowed by chip
Revision 4:
* Remove reboot_notifier and place disable code into platform_device's shutdown
function
* Removed sysfs interface
Revision 5:
* Added setting of .bootstatus on driver init
* Added initial timeout on driver init
Signed-off-by: Johannes Thumshirn
---
MAINTAINERS |6 ++
drivers/watchdog/Kconfig |8 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/mena21_wdt.c | 234 +
4 files changed, 249 insertions(+)
create mode 100644 drivers/watchdog/mena21_wdt.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 7714c3c..023945a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5307,6 +5307,12 @@ F: drivers/mtd/
F: include/linux/mtd/
F: include/uapi/mtd/
+MEN A21 WATCHDOG DRIVER
+M: Johannes Thumshirn
+L: linux-watch...@vger.kernel.org
+S: Supported
+F: drivers/watchdog/mena21_wdt.c
+
METAG ARCHITECTURE
M: James Hogan
S: Supported
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index e89fc31..192b84d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1172,6 +1172,14 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
The value can be overridden by the wdt_period command-line parameter.
+config MEN_A21_WDT
+ tristate "MEN A21 VME CPU Carrier Board Watchdog Timer"
+ select WATCHDOG_CORE
+ help
+Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.
+
+ If unsure select N here.
+
# PPC64 Architecture
config WATCHDOG_RTAS
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index a300b94..bffdcb1 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
+obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
# PPC64 Architecture
obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
new file mode 100644
index 000..e586c2e
--- /dev/null
+++ b/drivers/watchdog/mena21_wdt.c
@@ -0,0 +1,234 @@
+/*
+ * Watchdog driver for the A21 VME CPU Boards
+ *
+ * Copyright (C) 2013 MEN Mikro Elektronik Nuernberg GmbH
+ *
+ * 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
+ */
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define GPIO_WD_ENAB 169
+#define GPIO_WD_FAST 170
+#define GPIO_WD_TRIG 171
+
+#define GPIO_RST_CAUSE_BASE 166
+
+struct a21_wdt_drv {
+ struct watchdog_device wdt;
+ struct mutex lock;
+};
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+ __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+
+static int a21_wdt_get_bootstatus(unsigned int *reset)
+{
+ int i;
+
+ for (i = 0; i < 3; i++)
+ *reset |= gpio_get_value(GPIO_RST_CAUSE_BASE + i)
+ ? (1 << i) : 0;
+
+ if (*reset >= 8)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int a21_wdt_start(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ mutex_lock(>lock);
+
+ gpio_set_value(GPIO_WD_ENAB, 1);
+
+ mutex_unlock(>lock);
+
+ return 0;
+}
+
+static int a21_wdt_stop(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ /* We don't stop if WDOG_NO_WAY_OUT is set */
+ if (test_bit(WDOG_NO_WAY_OUT, >status))
+ return -EINVAL;
+
+ mutex_lock(>lock);
+
+ gpio_set_value(GPIO_WD_ENAB, 0);
+
+ mutex_unlock(>lock);
+
+ return 0;
+}
+
+static int a21_wdt_ping(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ mutex_lock(>lock);
+
+ gpio_set_value(GPIO_WD_TRIG, 0);
+ ndelay(10);
+ gpio_set_value(GPIO_WD_TRIG, 1);
+
+ mutex_unlock(>lock);
+
+ return 0;
+}
+
+static int a21_wdt_set_timeout(struct watchdog_device *wdt,
+ unsigned int timeout)
+{
+ struct a21_wdt_drv
[PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
This patch adds the driver for the watchdog devices found on MEN Mikro
Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
watchdog framework.
Revision 2:
* Removed unneeded open flag in struct a21_wdt_drv
* Corrected 3bit reason code from gpio
* Additional sysfs files are now part of watchdog sysfs
* Changed OFF/ON delay in ping from 400ms to 10ns
* Reworked timeout setting
* Removed a21_wdt_ioctl(...)
Revision 3:
* Changed pr_{err,info} to dev_{err,info}
* Removed out of memory error print
* Transition from fast to slow mode not allowed by chip
Revision 4:
* Remove reboot_notifier and place disable code into platform_device's shutdown
function
* Removed sysfs interface
Revision 5:
* Added setting of .bootstatus on driver init
* Added initial timeout on driver init
Signed-off-by: Johannes Thumshirn johannes.thumsh...@men.de
---
MAINTAINERS |6 ++
drivers/watchdog/Kconfig |8 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/mena21_wdt.c | 234 +
4 files changed, 249 insertions(+)
create mode 100644 drivers/watchdog/mena21_wdt.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 7714c3c..023945a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5307,6 +5307,12 @@ F: drivers/mtd/
F: include/linux/mtd/
F: include/uapi/mtd/
+MEN A21 WATCHDOG DRIVER
+M: Johannes Thumshirn johannes.thumsh...@men.de
+L: linux-watch...@vger.kernel.org
+S: Supported
+F: drivers/watchdog/mena21_wdt.c
+
METAG ARCHITECTURE
M: James Hogan james.ho...@imgtec.com
S: Supported
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index e89fc31..192b84d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1172,6 +1172,14 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
The value can be overridden by the wdt_period command-line parameter.
+config MEN_A21_WDT
+ tristate MEN A21 VME CPU Carrier Board Watchdog Timer
+ select WATCHDOG_CORE
+ help
+Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.
+
+ If unsure select N here.
+
# PPC64 Architecture
config WATCHDOG_RTAS
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index a300b94..bffdcb1 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
+obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
# PPC64 Architecture
obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
new file mode 100644
index 000..e586c2e
--- /dev/null
+++ b/drivers/watchdog/mena21_wdt.c
@@ -0,0 +1,234 @@
+/*
+ * Watchdog driver for the A21 VME CPU Boards
+ *
+ * Copyright (C) 2013 MEN Mikro Elektronik Nuernberg GmbH
+ *
+ * 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
+ */
+#include linux/module.h
+#include linux/moduleparam.h
+#include linux/types.h
+#include linux/kernel.h
+#include linux/slab.h
+#include linux/platform_device.h
+#include linux/watchdog.h
+#include linux/uaccess.h
+#include linux/gpio.h
+#include linux/delay.h
+#include linux/bitops.h
+
+#define GPIO_WD_ENAB 169
+#define GPIO_WD_FAST 170
+#define GPIO_WD_TRIG 171
+
+#define GPIO_RST_CAUSE_BASE 166
+
+struct a21_wdt_drv {
+ struct watchdog_device wdt;
+ struct mutex lock;
+};
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout, Watchdog cannot be stopped once started (default=
+ __MODULE_STRING(WATCHDOG_NOWAYOUT) ));
+
+static int a21_wdt_get_bootstatus(unsigned int *reset)
+{
+ int i;
+
+ for (i = 0; i 3; i++)
+ *reset |= gpio_get_value(GPIO_RST_CAUSE_BASE + i)
+ ? (1 i) : 0;
+
+ if (*reset = 8)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int a21_wdt_start(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ mutex_lock(drv-lock);
+
+ gpio_set_value(GPIO_WD_ENAB, 1);
+
+ mutex_unlock(drv-lock);
+
+ return 0;
+}
+
+static int a21_wdt_stop(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ /* We don't stop if WDOG_NO_WAY_OUT is set */
+ if (test_bit(WDOG_NO_WAY_OUT, wdt-status))
+ return -EINVAL;
+
+ mutex_lock(drv-lock);
+
+ gpio_set_value(GPIO_WD_ENAB, 0);
+
+ mutex_unlock(drv-lock);
+
+ return 0;
+}
+
+static int a21_wdt_ping(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ mutex_lock(drv-lock);
+
+ gpio_set_value(GPIO_WD_TRIG, 0);
+ ndelay(10);
+
Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Fri, May 31, 2013 at 10:58:48AM +0200, Johannes Thumshirn wrote: This patch adds the driver for the watchdog devices found on MEN Mikro Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the watchdog framework. [...] +MODULE_DESCRIPTION(MEN A21 Watchdog); +MODULE_LICENSE(GPL); +MODULE_ALIAS(platform:a21-watchdog); -- 1.7.9.5 Args, sorry messed up the thread :-(. I'm not so firm with using mutt for patches, but git send-email doesn't seem to like Exchange here... Johannes -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Fri, May 31, 2013 at 10:58:48AM +0200, Johannes Thumshirn wrote:
This patch adds the driver for the watchdog devices found on MEN Mikro
Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
watchdog framework.
Revision 2:
* Removed unneeded open flag in struct a21_wdt_drv
* Corrected 3bit reason code from gpio
* Additional sysfs files are now part of watchdog sysfs
* Changed OFF/ON delay in ping from 400ms to 10ns
* Reworked timeout setting
* Removed a21_wdt_ioctl(...)
Revision 3:
* Changed pr_{err,info} to dev_{err,info}
* Removed out of memory error print
* Transition from fast to slow mode not allowed by chip
Revision 4:
* Remove reboot_notifier and place disable code into platform_device's
shutdown function
* Removed sysfs interface
Revision 5:
* Added setting of .bootstatus on driver init
* Added initial timeout on driver init
Signed-off-by: Johannes Thumshirn johannes.thumsh...@men.de
---
MAINTAINERS |6 ++
drivers/watchdog/Kconfig |8 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/mena21_wdt.c | 234
+
4 files changed, 249 insertions(+)
create mode 100644 drivers/watchdog/mena21_wdt.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 7714c3c..023945a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5307,6 +5307,12 @@ F: drivers/mtd/
F: include/linux/mtd/
F: include/uapi/mtd/
+MEN A21 WATCHDOG DRIVER
+M: Johannes Thumshirn johannes.thumsh...@men.de
+L: linux-watch...@vger.kernel.org
+S: Supported
+F: drivers/watchdog/mena21_wdt.c
+
METAG ARCHITECTURE
M: James Hogan james.ho...@imgtec.com
S: Supported
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index e89fc31..192b84d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1172,6 +1172,14 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
The value can be overridden by the wdt_period command-line parameter.
+config MEN_A21_WDT
+ tristate MEN A21 VME CPU Carrier Board Watchdog Timer
+ select WATCHDOG_CORE
+ help
+Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.
+
+ If unsure select N here.
+
# PPC64 Architecture
config WATCHDOG_RTAS
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index a300b94..bffdcb1 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
+obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
# PPC64 Architecture
obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
new file mode 100644
index 000..e586c2e
--- /dev/null
+++ b/drivers/watchdog/mena21_wdt.c
@@ -0,0 +1,234 @@
+/*
+ * Watchdog driver for the A21 VME CPU Boards
+ *
+ * Copyright (C) 2013 MEN Mikro Elektronik Nuernberg GmbH
+ *
+ * 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
+ */
+#include linux/module.h
+#include linux/moduleparam.h
+#include linux/types.h
+#include linux/kernel.h
+#include linux/slab.h
+#include linux/platform_device.h
+#include linux/watchdog.h
+#include linux/uaccess.h
+#include linux/gpio.h
+#include linux/delay.h
+#include linux/bitops.h
+
+#define GPIO_WD_ENAB 169
+#define GPIO_WD_FAST 170
+#define GPIO_WD_TRIG 171
+
+#define GPIO_RST_CAUSE_BASE 166
+
+struct a21_wdt_drv {
+ struct watchdog_device wdt;
+ struct mutex lock;
+};
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout, Watchdog cannot be stopped once started
(default=
+ __MODULE_STRING(WATCHDOG_NOWAYOUT) ));
+
+static int a21_wdt_get_bootstatus(unsigned int *reset)
+{
+ int i;
+
+ for (i = 0; i 3; i++)
+ *reset |= gpio_get_value(GPIO_RST_CAUSE_BASE + i)
+ ? (1 i) : 0;
+
+ if (*reset = 8)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int a21_wdt_start(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ mutex_lock(drv-lock);
+
+ gpio_set_value(GPIO_WD_ENAB, 1);
+
+ mutex_unlock(drv-lock);
+
+ return 0;
+}
+
+static int a21_wdt_stop(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ /* We don't stop if WDOG_NO_WAY_OUT is set */
+ if (test_bit(WDOG_NO_WAY_OUT, wdt-status))
+ return -EINVAL;
+
+ mutex_lock(drv-lock);
+
+ gpio_set_value(GPIO_WD_ENAB, 0);
+
+ mutex_unlock(drv-lock);
+
+ return 0;
+}
+
+static int a21_wdt_ping(struct
Re: [PATCH v5 1/2] watchdog: New watchdog driver for MEN A21 watchdogs
On Fri, May 31, 2013 at 03:36:54AM -0700, Guenter Roeck wrote:
On Fri, May 31, 2013 at 10:58:48AM +0200, Johannes Thumshirn wrote:
This patch adds the driver for the watchdog devices found on MEN Mikro
Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
watchdog framework.
Revision 2:
* Removed unneeded open flag in struct a21_wdt_drv
* Corrected 3bit reason code from gpio
* Additional sysfs files are now part of watchdog sysfs
* Changed OFF/ON delay in ping from 400ms to 10ns
* Reworked timeout setting
* Removed a21_wdt_ioctl(...)
Revision 3:
* Changed pr_{err,info} to dev_{err,info}
* Removed out of memory error print
* Transition from fast to slow mode not allowed by chip
Revision 4:
* Remove reboot_notifier and place disable code into platform_device's
shutdown function
* Removed sysfs interface
Revision 5:
* Added setting of .bootstatus on driver init
* Added initial timeout on driver init
Signed-off-by: Johannes Thumshirn johannes.thumsh...@men.de
---
MAINTAINERS |6 ++
drivers/watchdog/Kconfig |8 ++
drivers/watchdog/Makefile |1 +
drivers/watchdog/mena21_wdt.c | 234
+
4 files changed, 249 insertions(+)
create mode 100644 drivers/watchdog/mena21_wdt.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 7714c3c..023945a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5307,6 +5307,12 @@ F: drivers/mtd/
F: include/linux/mtd/
F: include/uapi/mtd/
+MEN A21 WATCHDOG DRIVER
+M: Johannes Thumshirn johannes.thumsh...@men.de
+L: linux-watch...@vger.kernel.org
+S: Supported
+F: drivers/watchdog/mena21_wdt.c
+
METAG ARCHITECTURE
M: James Hogan james.ho...@imgtec.com
S: Supported
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index e89fc31..192b84d 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1172,6 +1172,14 @@ config BOOKE_WDT_DEFAULT_TIMEOUT
The value can be overridden by the wdt_period command-line parameter.
+config MEN_A21_WDT
+ tristate MEN A21 VME CPU Carrier Board Watchdog Timer
+ select WATCHDOG_CORE
+ help
+Watchdog driver for MEN A21 VMEbus CPU Carrier Boards.
+
+ If unsure select N here.
+
# PPC64 Architecture
config WATCHDOG_RTAS
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index a300b94..bffdcb1 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -143,6 +143,7 @@ obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
+obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
# PPC64 Architecture
obj-$(CONFIG_WATCHDOG_RTAS) += wdrtas.o
diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c
new file mode 100644
index 000..e586c2e
--- /dev/null
+++ b/drivers/watchdog/mena21_wdt.c
@@ -0,0 +1,234 @@
+/*
+ * Watchdog driver for the A21 VME CPU Boards
+ *
+ * Copyright (C) 2013 MEN Mikro Elektronik Nuernberg GmbH
+ *
+ * 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
+ */
+#include linux/module.h
+#include linux/moduleparam.h
+#include linux/types.h
+#include linux/kernel.h
+#include linux/slab.h
+#include linux/platform_device.h
+#include linux/watchdog.h
+#include linux/uaccess.h
+#include linux/gpio.h
+#include linux/delay.h
+#include linux/bitops.h
+
+#define GPIO_WD_ENAB 169
+#define GPIO_WD_FAST 170
+#define GPIO_WD_TRIG 171
+
+#define GPIO_RST_CAUSE_BASE 166
+
+struct a21_wdt_drv {
+ struct watchdog_device wdt;
+ struct mutex lock;
+};
+
+static bool nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, bool, 0);
+MODULE_PARM_DESC(nowayout, Watchdog cannot be stopped once started
(default=
+ __MODULE_STRING(WATCHDOG_NOWAYOUT) ));
+
+static int a21_wdt_get_bootstatus(unsigned int *reset)
+{
+ int i;
+
+ for (i = 0; i 3; i++)
+ *reset |= gpio_get_value(GPIO_RST_CAUSE_BASE + i)
+ ? (1 i) : 0;
+
+ if (*reset = 8)
+ return -EINVAL;
+
+ return 0;
+}
+
+static int a21_wdt_start(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ mutex_lock(drv-lock);
+
+ gpio_set_value(GPIO_WD_ENAB, 1);
+
+ mutex_unlock(drv-lock);
+
+ return 0;
+}
+
+static int a21_wdt_stop(struct watchdog_device *wdt)
+{
+ struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
+
+ /* We don't stop if WDOG_NO_WAY_OUT is set */
+ if (test_bit(WDOG_NO_WAY_OUT, wdt-status))
+ return -EINVAL;
