* [U-Boot] [PATCH 0/3] add new wdt driver for sp805
@ 2019-05-07 3:16 Qiang Zhao
2019-05-07 3:16 ` [U-Boot] [patch v3 1/3] watchdog: add sp805 watchdog support Qiang Zhao
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Qiang Zhao @ 2019-05-07 3:16 UTC (permalink / raw)
To: u-boot
changes for v2:
- modify the driver to DM
changes for v3:
- drop member "timeout" of struct "sp805_wat_priv", it is not
needed
Zhao Qiang (3):
watchdog: add sp805 watchdog support
dts: fsl-ls1028a: add sp805 node which is a watchdog
defconfig: ls1028ardb: enable wdt
MAINTAINERS | 1 +
arch/arm/dts/fsl-ls1028a.dtsi | 4 ++
configs/ls1028ardb_defconfig | 3 +
drivers/watchdog/Kconfig | 7 ++
drivers/watchdog/Makefile | 1 +
drivers/watchdog/sp805_wdt.c | 126 ++++++++++++++++++++++++++++++++++
6 files changed, 142 insertions(+)
create mode 100644 drivers/watchdog/sp805_wdt.c
--
2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot] [patch v3 1/3] watchdog: add sp805 watchdog support 2019-05-07 3:16 [U-Boot] [PATCH 0/3] add new wdt driver for sp805 Qiang Zhao @ 2019-05-07 3:16 ` Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 2/3] dts: fsl-ls1028a: add sp805 node which is a watchdog Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 3/3] defconfig: ls1028ardb: enable wdt Qiang Zhao 2 siblings, 0 replies; 6+ messages in thread From: Qiang Zhao @ 2019-05-07 3:16 UTC (permalink / raw) To: u-boot sp805 is watchdog on some NXP layerscape SoCs, Now add its driver in uboot. To add CONFIG_WDT_SP805=y CONFIG_WDT=y CONFIG_CMD_WDT=y in defconfig to use it. Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> --- MAINTAINERS | 1 + drivers/watchdog/Kconfig | 7 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/sp805_wdt.c | 127 +++++++++++++++++++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 drivers/watchdog/sp805_wdt.c diff --git a/MAINTAINERS b/MAINTAINERS index 8f237128b2..e8e7a92802 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -410,6 +410,7 @@ FREESCALE QORIQ M: York Sun <york.sun@nxp.com> S: Maintained T: git git://git.denx.de/u-boot-fsl-qoriq.git +F: drivers/watchdog/sp805_wdt.c I2C M: Heiko Schocher <hs@denx.de> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b06c5447f6..29e04630d2 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -95,6 +95,13 @@ config WDT_ORION Select this to enable Orion watchdog timer, which can be found on some Marvell Armada chips. +config WDT_SP805 + bool "SP805 watchdog timer support" + depends on WDT + help + Select this to enable SP805 watchdog timer, which can be found on some + nxp layerscape chips. + config WDT_CDNS bool "Cadence watchdog timer support" depends on WDT diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 19c631bb58..eb285bde24 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -25,3 +25,4 @@ obj-$(CONFIG_BCM2835_WDT) += bcm2835_wdt.o obj-$(CONFIG_WDT_ORION) += orion_wdt.o obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o obj-$(CONFIG_MPC8xx_WATCHDOG) += mpc8xx_wdt.o +obj-$(CONFIG_WDT_SP805) += sp805_wdt.o diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c new file mode 100644 index 0000000000..966128216f --- /dev/null +++ b/drivers/watchdog/sp805_wdt.c @@ -0,0 +1,127 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Watchdog driver for SP805 on some Layerscape SoC + * + * Copyright 2019 NXP + */ + +#include <asm/io.h> +#include <common.h> +#include <dm/device.h> +#include <dm/fdtaddr.h> +#include <dm/read.h> +#include <linux/bitops.h> +#include <watchdog.h> +#include <wdt.h> + +#define WDTLOAD 0x000 +#define WDTCONTROL 0x008 +#define WDTINTCLR 0x00C +#define WDTLOCK 0xC00 + +#define TIME_OUT_MIN_MSECS 1 +#define TIME_OUT_MAX_MSECS 120000 +#define SYS_FSL_WDT_CLK_DIV 16 +#define INT_ENABLE BIT(0) +#define RESET_ENABLE BIT(1) +#define DISABLE 0 +#define UNLOCK 0x1ACCE551 +#define LOCK 0x00000001 +#define INT_MASK BIT(0) + +DECLARE_GLOBAL_DATA_PTR; + +struct sp805_wdt_priv { + void __iomem *reg; +}; + +static int sp805_wdt_reset(struct udevice *dev) +{ + struct sp805_wdt_priv *priv = dev_get_priv(dev); + + writel(UNLOCK, priv->reg + WDTLOCK); + writel(INT_MASK, priv->reg + WDTINTCLR); + writel(LOCK, priv->reg + WDTLOCK); + readl(priv->reg + WDTLOCK); + + return 0; +} + +static int sp805_wdt_start(struct udevice *dev, u64 timeout, ulong flags) +{ + u32 load_value; + u32 load_time; + struct sp805_wdt_priv *priv = dev_get_priv(dev); + + load_time = (u32)timeout; + if (timeout < TIME_OUT_MIN_MSECS) + load_time = TIME_OUT_MIN_MSECS; + else if (timeout > TIME_OUT_MAX_MSECS) + load_time = TIME_OUT_MAX_MSECS; + /* sp805 runs counter with given value twice, so when the max timeout is + * set 120s, the gd->bus_clk is less than 1145MHz, the load_value will + * not overflow. + */ + load_value = (gd->bus_clk) / + (2 * 1000 * SYS_FSL_WDT_CLK_DIV) * load_time; + + writel(UNLOCK, priv->reg + WDTLOCK); + writel(load_value, priv->reg + WDTLOAD); + writel(INT_MASK, priv->reg + WDTINTCLR); + writel(INT_ENABLE | RESET_ENABLE, priv->reg + WDTCONTROL); + writel(LOCK, priv->reg + WDTLOCK); + readl(priv->reg + WDTLOCK); + + return 0; +} + +static int sp805_wdt_stop(struct udevice *dev) +{ + struct sp805_wdt_priv *priv = dev_get_priv(dev); + + writel(UNLOCK, priv->reg + WDTLOCK); + writel(DISABLE, priv->reg + WDTCONTROL); + writel(LOCK, priv->reg + WDTLOCK); + readl(priv->reg + WDTLOCK); + + return 0; +} + +static int sp805_wdt_probe(struct udevice *dev) +{ + debug("%s: Probing wdt%u\n", __func__, dev->seq); + + return 0; +} + +static int sp805_wdt_ofdata_to_platdata(struct udevice *dev) +{ + struct sp805_wdt_priv *priv = dev_get_priv(dev); + + priv->reg = (void __iomem *)dev_read_addr(dev); + if (IS_ERR(priv->reg)) + return PTR_ERR(priv->reg); + + return 0; +} + +static const struct wdt_ops sp805_wdt_ops = { + .start = sp805_wdt_start, + .reset = sp805_wdt_reset, + .stop = sp805_wdt_stop, +}; + +static const struct udevice_id sp805_wdt_ids[] = { + { .compatible = "arm,sp805-wdt" }, + {} +}; + +U_BOOT_DRIVER(sp805_wdt) = { + .name = "sp805_wdt", + .id = UCLASS_WDT, + .of_match = sp805_wdt_ids, + .probe = sp805_wdt_probe, + .priv_auto_alloc_size = sizeof(struct sp805_wdt_priv), + .ofdata_to_platdata = sp805_wdt_ofdata_to_platdata, + .ops = &sp805_wdt_ops, +}; -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [patch v3 2/3] dts: fsl-ls1028a: add sp805 node which is a watchdog 2019-05-07 3:16 [U-Boot] [PATCH 0/3] add new wdt driver for sp805 Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 1/3] watchdog: add sp805 watchdog support Qiang Zhao @ 2019-05-07 3:16 ` Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 3/3] defconfig: ls1028ardb: enable wdt Qiang Zhao 2 siblings, 0 replies; 6+ messages in thread From: Qiang Zhao @ 2019-05-07 3:16 UTC (permalink / raw) To: u-boot add sp805 nodes in fsl-ls1028a.dtsi Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> --- arch/arm/dts/fsl-ls1028a.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi index 35382eb3b4..30fb20cd3e 100644 --- a/arch/arm/dts/fsl-ls1028a.dtsi +++ b/arch/arm/dts/fsl-ls1028a.dtsi @@ -338,4 +338,8 @@ status = "disabled"; }; + cluster1_core0_watchdog: wdt at c000000 { + compatible = "arm,sp805-wdt"; + reg = <0x0 0xc000000 0x0 0x1000>; + }; }; -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [patch v3 3/3] defconfig: ls1028ardb: enable wdt 2019-05-07 3:16 [U-Boot] [PATCH 0/3] add new wdt driver for sp805 Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 1/3] watchdog: add sp805 watchdog support Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 2/3] dts: fsl-ls1028a: add sp805 node which is a watchdog Qiang Zhao @ 2019-05-07 3:16 ` Qiang Zhao 2 siblings, 0 replies; 6+ messages in thread From: Qiang Zhao @ 2019-05-07 3:16 UTC (permalink / raw) To: u-boot Enable watchdog which is sp805, can be found on some NXP Layerscape SoC. Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> --- configs/ls1028ardb_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/ls1028ardb_defconfig b/configs/ls1028ardb_defconfig index e3ff21f10c..5edcaae24b 100644 --- a/configs/ls1028ardb_defconfig +++ b/configs/ls1028ardb_defconfig @@ -70,3 +70,6 @@ CONFIG_NR_DRAM_BANKS=2 CONFIG_DM_PCI_COMPAT=y CONFIG_PCI_PNP=y CONFIG_DM_MMC=y +CONFIG_WDT_SP805=y +CONFIG_WDT=y +CONFIG_CMD_WDT=y -- 2.17.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 0/3] add new wdt driver for sp805 @ 2019-04-29 8:24 Qiang Zhao 2019-05-22 12:33 ` Prabhakar Kushwaha 0 siblings, 1 reply; 6+ messages in thread From: Qiang Zhao @ 2019-04-29 8:24 UTC (permalink / raw) To: u-boot changes for v2: - modify the driver to DM Zhao Qiang (3): watchdog: add sp805 watchdog support dts: fsl-ls1028a: add sp805 node which is a watchdog defconfig: ls1028ardb: enable wdt MAINTAINERS | 1 + arch/arm/dts/fsl-ls1028a.dtsi | 4 ++ configs/ls1028ardb_defconfig | 3 + drivers/watchdog/Kconfig | 7 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/sp805_wdt.c | 126 ++++++++++++++++++++++++++++++++++ 6 files changed, 142 insertions(+) create mode 100644 drivers/watchdog/sp805_wdt.c -- 2.17.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH 0/3] add new wdt driver for sp805 2019-04-29 8:24 [U-Boot] [PATCH 0/3] add new wdt driver for sp805 Qiang Zhao @ 2019-05-22 12:33 ` Prabhakar Kushwaha 0 siblings, 0 replies; 6+ messages in thread From: Prabhakar Kushwaha @ 2019-05-22 12:33 UTC (permalink / raw) To: u-boot > -----Original Message----- > From: U-Boot <u-boot-bounces@lists.denx.de> On Behalf Of Qiang Zhao > Sent: Monday, April 29, 2019 1:55 PM > To: York Sun <york.sun@nxp.com> > Cc: u-boot at lists.denx.de > Subject: [U-Boot] [PATCH 0/3] add new wdt driver for sp805 > > changes for v2: > - modify the driver to DM > > Zhao Qiang (3): > watchdog: add sp805 watchdog support > dts: fsl-ls1028a: add sp805 node which is a watchdog > defconfig: ls1028ardb: enable wdt > Patch series applied with updated subject and applied to fsl-qoriq master, awaiting upstream --pk ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-22 12:33 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-07 3:16 [U-Boot] [PATCH 0/3] add new wdt driver for sp805 Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 1/3] watchdog: add sp805 watchdog support Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 2/3] dts: fsl-ls1028a: add sp805 node which is a watchdog Qiang Zhao 2019-05-07 3:16 ` [U-Boot] [patch v3 3/3] defconfig: ls1028ardb: enable wdt Qiang Zhao -- strict thread matches above, loose matches on Subject: below -- 2019-04-29 8:24 [U-Boot] [PATCH 0/3] add new wdt driver for sp805 Qiang Zhao 2019-05-22 12:33 ` Prabhakar Kushwaha
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.