From c5f5f23f7d45e837d1a6b6f5444bfc894d2bc3b6 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Sun, 21 Jan 2018 17:52:18 +0800 Subject: [PATCH] watchdog: add meson watchdog driver v3 PD#156734: watchdog: add meson watchdog driver v3 Change-Id: I5aac3393fd56b9961d669ca990dea0b7d42ee016 Signed-off-by: Bo Yang --- .../bindings/watchdog/meson-gxbb-wdt.txt | 7 +- MAINTAINERS | 4 +- arch/arm64/boot/dts/amlogic/mesong12a.dtsi | 8 + arch/arm64/configs/meson64_defconfig | 1 + drivers/amlogic/watchdog/Kconfig | 10 + drivers/amlogic/watchdog/Makefile | 3 +- drivers/amlogic/watchdog/meson_wdt_v3.c | 275 +++++++++++++++++++++ 7 files changed, 304 insertions(+), 4 deletions(-) create mode 100644 drivers/amlogic/watchdog/meson_wdt_v3.c diff --git a/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt index c7fe36f..8735dfa 100644 --- a/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt @@ -2,7 +2,12 @@ Meson GXBB SoCs Watchdog timer Required properties: -- compatible : should be "amlogic,meson-gxbb-wdt" +- compatible : should be one of + "amlogic,meson-gxbb-wdt" + "amlogic,meson-gxl-wdt" + "amlogic,meson-axg-wdt" + "amlogic,meson-txlx-wdt" + "amlogic,meson-g12a-wdt" - reg : Specifies base physical address and size of the registers. - clocks : Should be a phandle to the Watchdog clock source, for GXBB the xtal is the default clock source. diff --git a/MAINTAINERS b/MAINTAINERS index f0d2427..9cf06d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13794,8 +13794,8 @@ M: Qiufang Dai F: drivers/amlogic/pm/* AMLOGIC WATCHDOG DRIVER SUPPORT -M: Bo Yang -F: drivers/amlogic/watchdog/* +M: Bo Yang +F: drivers/amlogic/watchdog/* AMLOGIC LED DRIVER SUPPORT M: Bo Yang diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 069b2d2..d3aeffa 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -261,6 +261,14 @@ }; }; + wdt: watchdog@0xffd0f0d0 { + compatible = "amlogic,meson-g12a-wdt"; + status = "okay"; + reg = <0x0 0xffd0f0d0 0x0 0x10>; + clock-names = "xtal"; + clocks = <&xtal>; + }; + soc { compatible = "simple-bus"; #address-cells = <2>; diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig index d7449e4..97a78e3 100644 --- a/arch/arm64/configs/meson64_defconfig +++ b/arch/arm64/configs/meson64_defconfig @@ -331,6 +331,7 @@ CONFIG_AMLOGIC_JTAG=y CONFIG_AMLOGIC_JTAG_MESON=y CONFIG_AMLOGIC_WDT=y CONFIG_AMLOGIC_WDT_MESON=y +CONFIG_AMLOGIC_WDT_MESON_V3=y CONFIG_AMLOGIC_ESM=y CONFIG_AMLOGIC_WIFI=y CONFIG_AMLOGIC_BT_DEVICE=y diff --git a/drivers/amlogic/watchdog/Kconfig b/drivers/amlogic/watchdog/Kconfig index 22dc977..17d2509 100644 --- a/drivers/amlogic/watchdog/Kconfig +++ b/drivers/amlogic/watchdog/Kconfig @@ -18,4 +18,14 @@ config AMLOGIC_WDT_MESON default n help say y to enable Amlogic meson watchdog driver. + +config AMLOGIC_WDT_MESON_V3 + tristate "Amlogic Meson SoCs Watchdog V3" + default n + help + Say Y here to include support for the watchdog timer + in Amlogic Meson SoCs. + To compile this driver as a module, choose M here. + + endif diff --git a/drivers/amlogic/watchdog/Makefile b/drivers/amlogic/watchdog/Makefile index 381fbee..b897002 100644 --- a/drivers/amlogic/watchdog/Makefile +++ b/drivers/amlogic/watchdog/Makefile @@ -1,6 +1,7 @@ # -# Makefile for MHL +# Makefile for Watchdog # obj-$(CONFIG_AMLOGIC_WDT_MESON) += meson_wdt.o +obj-$(CONFIG_AMLOGIC_WDT_MESON_V3) += meson_wdt_v3.o diff --git a/drivers/amlogic/watchdog/meson_wdt_v3.c b/drivers/amlogic/watchdog/meson_wdt_v3.c new file mode 100644 index 0000000..61b6023 --- /dev/null +++ b/drivers/amlogic/watchdog/meson_wdt_v3.c @@ -0,0 +1,275 @@ +/* + * This file is provided under a dual BSD/GPLv2 license. When using or + * redistributing this file, you may do so under either license. + * + * GPL LICENSE SUMMARY + * + * Copyright (c) 2016 BayLibre, SAS. + * Author: Neil Armstrong + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * The full GNU General Public License is included in this distribution + * in the file called COPYING. + * + * BSD LICENSE + * + * Copyright (c) 2016 BayLibre, SAS. + * Author: Neil Armstrong + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Intel Corporation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define DEFAULT_TIMEOUT 30 /* seconds */ + +#define MESON_WDT_CTRL_REG 0x0 +#define MESON_WDT_TCNT_REG 0x8 +#define MESON_WDT_RSET_REG 0xc + +#define MESON_WDT_CTRL_CLKDIV_EN BIT(25) +#define MESON_WDT_CTRL_CLK_EN BIT(24) +#define MESON_WDT_CTRL_EE_RESET BIT(21) +#define MESON_WDT_CTRL_EN BIT(18) +#define MESON_WDT_CTRL_DIV_MASK (BIT(18) - 1) + +#define MESON_WDT_TCNT_SETUP_MASK (BIT(16) - 1) +#define MESON_WDT_TCNT_CNT_SHIFT 16 + +struct meson_wdt { + void __iomem *reg_base; + struct watchdog_device wdt_dev; + struct clk *clk; +}; + +static int meson_wdt_start(struct watchdog_device *wdt_dev) +{ + struct meson_wdt *data = watchdog_get_drvdata(wdt_dev); + + writel(readl(data->reg_base + MESON_WDT_CTRL_REG) | MESON_WDT_CTRL_EN, + data->reg_base + MESON_WDT_CTRL_REG); + + return 0; +} + +static int meson_wdt_stop(struct watchdog_device *wdt_dev) +{ + struct meson_wdt *data = watchdog_get_drvdata(wdt_dev); + + writel(readl(data->reg_base + MESON_WDT_CTRL_REG) & ~MESON_WDT_CTRL_EN, + data->reg_base + MESON_WDT_CTRL_REG); + + return 0; +} + +static int meson_wdt_ping(struct watchdog_device *wdt_dev) +{ + struct meson_wdt *data = watchdog_get_drvdata(wdt_dev); + + writel(0, data->reg_base + MESON_WDT_RSET_REG); + + return 0; +} + +static int meson_wdt_set_timeout(struct watchdog_device *wdt_dev, + unsigned int timeout) +{ + struct meson_wdt *data = watchdog_get_drvdata(wdt_dev); + unsigned long tcnt = timeout * 1000; + + if (tcnt > MESON_WDT_TCNT_SETUP_MASK) + tcnt = MESON_WDT_TCNT_SETUP_MASK; + + wdt_dev->timeout = timeout; + + meson_wdt_ping(wdt_dev); + + writel(tcnt, data->reg_base + MESON_WDT_TCNT_REG); + + return 0; +} + +static unsigned int meson_wdt_get_timeleft(struct watchdog_device *wdt_dev) +{ + struct meson_wdt *data = watchdog_get_drvdata(wdt_dev); + unsigned long reg; + + reg = readl(data->reg_base + MESON_WDT_TCNT_REG); + + return ((reg >> MESON_WDT_TCNT_CNT_SHIFT) - + (reg & MESON_WDT_TCNT_SETUP_MASK)) / 1000; +} + +static const struct watchdog_ops meson_wdt_ops = { + .start = meson_wdt_start, + .stop = meson_wdt_stop, + .ping = meson_wdt_ping, + .set_timeout = meson_wdt_set_timeout, + .get_timeleft = meson_wdt_get_timeleft, +}; + +static const struct watchdog_info meson_wdt_info = { + .identity = "Meson Watchdog V3", + .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, +}; + +static int __maybe_unused meson_wdt_resume(struct device *dev) +{ + struct meson_wdt *data = dev_get_drvdata(dev); + + if (watchdog_active(&data->wdt_dev)) + meson_wdt_start(&data->wdt_dev); + + return 0; +} + +static int __maybe_unused meson_wdt_suspend(struct device *dev) +{ + struct meson_wdt *data = dev_get_drvdata(dev); + + if (watchdog_active(&data->wdt_dev)) + meson_wdt_stop(&data->wdt_dev); + + return 0; +} + +static const struct dev_pm_ops meson_wdt_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(meson_wdt_suspend, meson_wdt_resume) +}; + +static const struct of_device_id meson_wdt_dt_ids[] = { + { .compatible = "amlogic,meson-gxbb-wdt", }, + { .compatible = "amlogic,meson-gxl-wdt", }, + { .compatible = "amlogic,meson-axg-wdt", }, + { .compatible = "amlogic,meson-txlx-wdt", }, + { .compatible = "amlogic,meson-g12a-wdt", }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, meson_wdt_dt_ids); + +static int meson_wdt_probe(struct platform_device *pdev) +{ + struct meson_wdt *data; + struct resource *res; + int ret; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + data->reg_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(data->reg_base)) + return PTR_ERR(data->reg_base); + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + return PTR_ERR(data->clk); + + clk_prepare_enable(data->clk); + + platform_set_drvdata(pdev, data); + + data->wdt_dev.parent = &pdev->dev; + data->wdt_dev.info = &meson_wdt_info; + data->wdt_dev.ops = &meson_wdt_ops; + data->wdt_dev.max_hw_heartbeat_ms = MESON_WDT_TCNT_SETUP_MASK; + data->wdt_dev.min_timeout = 1; + data->wdt_dev.timeout = DEFAULT_TIMEOUT; + watchdog_set_drvdata(&data->wdt_dev, data); + + /* Setup with 1ms timebase */ + writel(((clk_get_rate(data->clk) / 1000) & MESON_WDT_CTRL_DIV_MASK) | + MESON_WDT_CTRL_EE_RESET | + MESON_WDT_CTRL_CLK_EN | + MESON_WDT_CTRL_CLKDIV_EN, + data->reg_base + MESON_WDT_CTRL_REG); + + meson_wdt_set_timeout(&data->wdt_dev, data->wdt_dev.timeout); + + ret = watchdog_register_device(&data->wdt_dev); + if (ret) { + clk_disable_unprepare(data->clk); + return ret; + } + + return 0; +} + +static int meson_wdt_remove(struct platform_device *pdev) +{ + struct meson_wdt *data = platform_get_drvdata(pdev); + + watchdog_unregister_device(&data->wdt_dev); + + clk_disable_unprepare(data->clk); + + return 0; +} + +static void meson_wdt_shutdown(struct platform_device *pdev) +{ + struct meson_wdt *data = platform_get_drvdata(pdev); + + meson_wdt_stop(&data->wdt_dev); +} + +static struct platform_driver meson_wdt_driver = { + .probe = meson_wdt_probe, + .remove = meson_wdt_remove, + .shutdown = meson_wdt_shutdown, + .driver = { + .name = "meson-wdt-v3", + .pm = &meson_wdt_pm_ops, + .of_match_table = meson_wdt_dt_ids, + }, +}; + +module_platform_driver(meson_wdt_driver); + +MODULE_ALIAS("platform:meson-wdt-v3"); +MODULE_AUTHOR("Neil Armstrong "); +MODULE_AUTHOR("Bo Yang "); +MODULE_DESCRIPTION("Amlogic Meson Watchdog timer driver v3"); +MODULE_LICENSE("Dual BSD/GPL"); -- 2.7.4