drivers/watchdog: Adding PRCMU based WD for ux500 processors

PATCH Superseded mathieu.poirier at linaro.org 2 participants 2 messages Aug 20, 2012

Subsystems (2)

Multifunction devices (MFD) Watchdog device drivers

lore

Share & tools

lore

mathieu.poirier at linaro.org

author

2012-08-20 19:50 UTC #0 lore raw

PATCH 1/1 drivers/watchdog: Adding PRCMU based WD for ux500 processors

From: "Mathieu J. Poirier" <[email protected]>

This patch is a partial re-write of the driver developed by Jonas Aaberg and brings it up to the new watchdog interface now the standard in the mainline kernel.

Cc Jonas Aaberg <[email protected]>

Signed-off-by Mathieu Poirier <[email protected]>

---
 drivers/watchdog/Kconfig      |   10 +++
 drivers/watchdog/Makefile     |    1 +
 drivers/watchdog/ux500_wdt.c  |  168 +++++++++++++++++++++++++++++++++++++++++
 include/linux/mfd/ux500_wdt.h |   19 +++++
 4 files changed, 198 insertions(+), 0 deletions(-)
 create mode 100644 drivers/watchdog/ux500_wdt.c
 create mode 100644 include/linux/mfd/ux500_wdt.h

drivers/watchdog/Kconfig +10 -0

index 53d7571..5e5f2e5 100644
@@ -352,6 +352,16 @@ config IMX2_WDT
 	  To compile this driver as a module, choose M here: the
 	  module will be called imx2_wdt.
 
+config UX500_WATCHDOG
+	bool "ST-Ericsson Ux500 watchdog"
+	depends on UX500_SOC_DB8500
+	default y
+	help
+	  Say Y here to include Watchdog timer support for the
+	  watchdog existing in the prcmu of ST-Ericsson Ux500 series platforms.
+	  This watchdog is used to reset the system and thus cannot be
+	  compiled as a module.
+
 # AVR32 Architecture
 
 config AT32AP700X_WDT

drivers/watchdog/Makefile +1 -0

index 572b39b..bec0ef8 100644
@@ -52,6 +52,7 @@ obj-$(CONFIG_STMP3XXX_WATCHDOG) += stmp3xxx_wdt.o
 obj-$(CONFIG_NUC900_WATCHDOG) += nuc900_wdt.o
 obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
 obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
+obj-$(CONFIG_UX500_WATCHDOG) += ux500_wdt.o
 
 # AVR32 Architecture
 obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o

drivers/watchdog/ux500_wdt.c new file +168 -0

168 lines not on this page · raw message

include/linux/mfd/ux500_wdt.h new file +19 -0

new file mode 100644
index 0000000..bfb91f1
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) ST Ericsson SA 2011
+ *
+ * License Terms: GNU General Public License v2
+ *
+ * STE Ux500 PRCMU API
+ */
+#ifndef __UX500_WDT_H
+#define __UX500_WDT_H
+
+/**
+ * struct ux500_wdt_data
+ */
+struct ux500_wdt_data {
+	int timeout;
+	int nowayout;
+};
+
+#endif /* __UX500_WDT_H */

Signature · 1 line

1.7.5.4

Baruch Siach

2012-08-20 20:00 UTC #1 lore raw

PATCH 1/1 drivers/watchdog: Adding PRCMU based WD for ux500 processors

Hi Mathieu,

Quoted 8 lines · mathieu.poirier at linaro.org

From: "Mathieu J. Poirier" <[email protected]>
This patch is a partial re-write of the driver developed by Jonas Aaberg and brings it up to the new watchdog interface now the standard in the mainline kernel.
Cc Jonas Aaberg <[email protected]>
Signed-off-by Mathieu Poirier <[email protected]>

[snip]

include/linux/mfd/ux500_wdt.h line 17

Quoted 7 lines

include/linux/mfd/ux500_wdt.h new file +7 -0

+/**
+ * struct ux500_wdt_data
+ */
+struct ux500_wdt_data {
+	int timeout;
+	int nowayout;
+};

This struct doesn't seem to be used anywhere.

baruch

Signature · 3 lines

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -