public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: "Álvaro Fernández Rojas" <noltari@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/8] dm: watchdog: add BCM6345 watchdog driver
Date: Sat, 13 May 2017 01:19:39 +0200	[thread overview]
Message-ID: <1494631186-28533-2-git-send-email-noltari@gmail.com> (raw)
In-Reply-To: <1494631186-28533-1-git-send-email-noltari@gmail.com>

This driver is a simplified version of linux/drivers/watchdog/bcm63xx_wdt.c

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 drivers/watchdog/Kconfig       |   8 +++
 drivers/watchdog/Makefile      |   1 +
 drivers/watchdog/bcm6345_wdt.c | 109 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 drivers/watchdog/bcm6345_wdt.c

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index bdaf5d4..8d56af7 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -46,4 +46,12 @@ config WDT_ASPEED
 	  It currently does not support Boot Flash Addressing Mode Detection or
 	  Second Boot.
 
+config WDT_BCM6345
+	bool "BCM6345 watchdog timer support"
+	depends on WDT && ARCH_BMIPS
+	help
+	  Select this to enable watchdog timer for BCM6345 SoCs.
+	  The watchdog timer is stopped when initialized.
+	  It performs full SoC reset.
+
 endmenu
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index 8378601..4b19e4c 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -18,4 +18,5 @@ obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o
 obj-$(CONFIG_WDT) += wdt-uclass.o
 obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o
 obj-$(CONFIG_WDT_ASPEED) += ast_wdt.o
+obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o
 obj-$(CONFIG_BCM2835_WDT)       += bcm2835_wdt.o
diff --git a/drivers/watchdog/bcm6345_wdt.c b/drivers/watchdog/bcm6345_wdt.c
new file mode 100644
index 0000000..858b6d5
--- /dev/null
+++ b/drivers/watchdog/bcm6345_wdt.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2017 Álvaro Fernández Rojas <noltari@gmail.com>
+ *
+ * Derived from linux/drivers/watchdog/bcm63xx_wdt.c:
+ *	Copyright (C) 2007 Miguel Gaio <miguel.gaio@efixo.com>
+ *	Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <wdt.h>
+#include <asm/io.h>
+
+/* WDT Value register */
+#define WDT_VAL_REG		0x0
+#define WDT_VAL_MIN		0x00000002
+#define WDT_VAL_MAX		0xfffffffe
+
+/* WDT Control register */
+#define WDT_CTL_REG		0x4
+#define WDT_CTL_START1_MASK	0x0000ff00
+#define WDT_CTL_START2_MASK	0x000000ff
+#define WDT_CTL_STOP1_MASK	0x0000ee00
+#define WDT_CTL_STOP2_MASK	0x000000ee
+
+struct bcm6345_wdt_priv {
+	void __iomem *regs;
+};
+
+static int bcm6345_wdt_reset(struct udevice *dev)
+{
+	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
+
+	writel_be(WDT_CTL_START1_MASK, priv->regs + WDT_CTL_REG);
+	writel_be(WDT_CTL_START2_MASK, priv->regs + WDT_CTL_REG);
+
+	return 0;
+}
+
+static int bcm6345_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
+{
+	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
+
+	if (timeout < WDT_VAL_MIN) {
+		debug("watchdog won't fire with less than 2 ticks\n");
+		timeout = WDT_VAL_MIN;
+	} else if (timeout > WDT_VAL_MAX) {
+		debug("maximum watchdog timeout exceeded\n");
+		timeout = WDT_VAL_MAX;
+	}
+
+	writel_be(timeout, priv->regs + WDT_VAL_REG);
+
+	return bcm6345_wdt_reset(dev);
+}
+
+static int bcm6345_wdt_expire_now(struct udevice *dev, ulong flags)
+{
+	return bcm6345_wdt_start(dev, WDT_VAL_MIN, flags);
+}
+
+static int bcm6345_wdt_stop(struct udevice *dev)
+{
+	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
+
+	writel_be(WDT_CTL_STOP1_MASK, priv->regs + WDT_CTL_REG);
+	writel_be(WDT_CTL_STOP2_MASK, priv->regs + WDT_CTL_REG);
+
+	return 0;
+}
+
+static const struct wdt_ops bcm6345_wdt_ops = {
+	.expire_now = bcm6345_wdt_expire_now,
+	.reset = bcm6345_wdt_reset,
+	.start = bcm6345_wdt_start,
+	.stop = bcm6345_wdt_stop,
+};
+
+static const struct udevice_id bcm6345_wdt_ids[] = {
+	{ .compatible = "brcm,bcm6345-wdt" },
+	{ /* sentinel */ }
+};
+
+static int bcm6345_wdt_probe(struct udevice *dev)
+{
+	struct bcm6345_wdt_priv *priv = dev_get_priv(dev);
+	fdt_addr_t addr;
+	fdt_size_t size;
+
+	addr = dev_get_addr_size_index(dev, 0, &size);
+	if (addr == FDT_ADDR_T_NONE)
+		return -EINVAL;
+
+	priv->regs = ioremap(addr, size);
+
+	bcm6345_wdt_stop(dev);
+
+	return 0;
+}
+
+U_BOOT_DRIVER(wdt_bcm6345) = {
+	.name = "wdt_bcm6345",
+	.id = UCLASS_WDT,
+	.of_match = bcm6345_wdt_ids,
+	.ops = &bcm6345_wdt_ops,
+	.priv_auto_alloc_size = sizeof(struct bcm6345_wdt_priv),
+	.probe = bcm6345_wdt_probe,
+};
-- 
2.1.4

  reply	other threads:[~2017-05-12 23:19 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-12 23:19 [U-Boot] [PATCH 0/8] mips: bmips: add bcm6345 watchdog support Álvaro Fernández Rojas
2017-05-12 23:19 ` Álvaro Fernández Rojas [this message]
2017-05-16  0:17   ` [U-Boot] [PATCH 1/8] dm: watchdog: add BCM6345 watchdog driver Simon Glass
2017-05-12 23:19 ` [U-Boot] [PATCH 2/8] mips: bmips: add bcm6345-wdt driver support for BCM6358 Álvaro Fernández Rojas
2017-05-16  0:17   ` Simon Glass
2017-05-12 23:19 ` [U-Boot] [PATCH 3/8] mips: bmips: add bcm6345-wdt driver support for BCM6328 Álvaro Fernández Rojas
2017-05-16  0:17   ` Simon Glass
2017-05-12 23:19 ` [U-Boot] [PATCH 4/8] mips: bmips: add bcm6345-wdt driver support for BCM63268 Álvaro Fernández Rojas
2017-05-16  0:17   ` Simon Glass
2017-05-12 23:19 ` [U-Boot] [PATCH 5/8] dm: sysreset: add watchdog-reboot driver Álvaro Fernández Rojas
2017-05-16  0:17   ` Simon Glass
2017-05-12 23:19 ` [U-Boot] [PATCH 6/8] mips: bmips: add wdt-reboot driver support for BCM6358 Álvaro Fernández Rojas
2017-05-16  0:17   ` Simon Glass
2017-05-12 23:19 ` [U-Boot] [PATCH 7/8] mips: bmips: add wdt-reboot driver support for BCM6328 Álvaro Fernández Rojas
2017-05-16  0:17   ` Simon Glass
2017-05-12 23:19 ` [U-Boot] [PATCH 8/8] mips: bmips: add wdt-reboot driver support for BCM63268 Álvaro Fernández Rojas
2017-05-16  0:18   ` Simon Glass
2017-05-16 16:29 ` [U-Boot] [PATCH v2 0/8] mips: bmips: add bcm6345 watchdog support Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 1/8] dm: watchdog: add BCM6345 watchdog driver Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 2/8] mips: bmips: add bcm6345-wdt driver support for BCM6358 Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 3/8] mips: bmips: add bcm6345-wdt driver support for BCM6328 Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 4/8] mips: bmips: add bcm6345-wdt driver support for BCM63268 Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 5/8] dm: sysreset: add watchdog-reboot driver Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 6/8] mips: bmips: add wdt-reboot driver support for BCM6358 Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 7/8] mips: bmips: add wdt-reboot driver support for BCM6328 Álvaro Fernández Rojas
2017-05-16 16:29   ` [U-Boot] [PATCH v2 8/8] mips: bmips: add wdt-reboot driver support for BCM63268 Álvaro Fernández Rojas
2017-05-20 16:09   ` [U-Boot] [PATCH v2 0/8] mips: bmips: add bcm6345 watchdog support Daniel Schwierzeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1494631186-28533-2-git-send-email-noltari@gmail.com \
    --to=noltari@gmail.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox