From: Linus Walleij <linus.walleij@linaro.org> To: Wim Van Sebroeck <wim@iguana.be>, Guenter Roeck <linux@roeck-us.net>, Jonas Jensen <jonas.jensen@gmail.com>, Andrew Jeffery <andrew@aj.id.au>, Joel Stanley <joel@jms.id.au> Cc: linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, Linus Walleij <linus.walleij@linaro.org> Subject: [PATCH 04/11] watchdog: ftwdt010: Add clock support Date: Sat, 12 Aug 2017 20:43:11 +0200 [thread overview] Message-ID: <20170812184318.10144-5-linus.walleij@linaro.org> (raw) In-Reply-To: <20170812184318.10144-1-linus.walleij@linaro.org> The Gemini platform now provides a proper clock look-up for this and other IPs, so add clock support to the driver. This also aids in using the same driver with other platforms such as MOXA ART. The IP has two clock inputs: PCLK (the IP peripheral clock) and EXTCLK (an external clock). We are a bit elaborate around this: on Gemini the EXTCLK is used by default today and it's 5MHz, and on MOXA ART the PCLK is used. On Aspeed the EXTCLK is used and it's 1MHz. So add some clever code to fall back to platform defaults if PCLK or EXTCLK is not provided by the device tree. Take this opportnity to implement .remove() for the driver that stops the watchdog and disables the clocks. Add credits that this code is inspired by MOXA ART. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/watchdog/ftwdt010_wdt.c | 79 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 8 deletions(-) diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c index ab38a3a89300..680279f5c679 100644 --- a/drivers/watchdog/ftwdt010_wdt.c +++ b/drivers/watchdog/ftwdt010_wdt.c @@ -5,6 +5,8 @@ * * Inspired by the out-of-tree drivers from OpenWRT: * Copyright (C) 2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt> + * Inspired by the MOXA ART driver from Jonas Jensen: + * Copyright (C) 2013 Jonas Jensen <jonas.jensen@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -18,9 +20,11 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/watchdog.h> +#include <linux/clk.h> #define FTWDT010_WDCOUNTER 0x0 #define FTWDT010_WDLOAD 0x4 @@ -29,19 +33,21 @@ #define WDRESTART_MAGIC 0x5AB9 -#define WDCR_CLOCK_5MHZ BIT(4) +#define WDCR_EXTCLK BIT(4) #define WDCR_WDEXT BIT(3) #define WDCR_WDINTR BIT(2) #define WDCR_SYS_RST BIT(1) #define WDCR_ENABLE BIT(0) -#define WDT_CLOCK 5000000 /* 5 MHz */ - struct ftwdt010_wdt { struct watchdog_device wdd; struct device *dev; void __iomem *base; bool has_irq; + struct clk *pclk; + struct clk *extclk; + unsigned int clk_freq; + bool use_extclk; }; static inline @@ -55,12 +61,13 @@ static int ftwdt010_wdt_start(struct watchdog_device *wdd) struct ftwdt010_wdt *gwdt = to_ftwdt010_wdt(wdd); u32 enable; - writel(wdd->timeout * WDT_CLOCK, gwdt->base + FTWDT010_WDLOAD); + writel(wdd->timeout * gwdt->clk_freq, gwdt->base + FTWDT010_WDLOAD); writel(WDRESTART_MAGIC, gwdt->base + FTWDT010_WDRESTART); /* set clock before enabling */ - enable = WDCR_CLOCK_5MHZ | WDCR_SYS_RST; + enable = WDCR_SYS_RST; + if (gwdt->use_extclk) + enable |= WDCR_EXTCLK; writel(enable, gwdt->base + FTWDT010_WDCR); - enable |= WDCR_CLOCK_5MHZ; if (gwdt->has_irq) enable |= WDCR_WDINTR; enable |= WDCR_ENABLE; @@ -125,6 +132,7 @@ static const struct watchdog_info ftwdt010_wdt_info = { static int ftwdt010_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; struct resource *res; struct ftwdt010_wdt *gwdt; unsigned int reg; @@ -140,11 +148,51 @@ static int ftwdt010_wdt_probe(struct platform_device *pdev) if (IS_ERR(gwdt->base)) return PTR_ERR(gwdt->base); + gwdt->use_extclk = of_property_read_bool(np, "faraday,use-extclk"); + + gwdt->pclk = devm_clk_get(dev, "PCLK"); + if (!IS_ERR(gwdt->pclk)) { + ret = clk_prepare_enable(gwdt->pclk); + if (ret) { + dev_err(&pdev->dev, "unable to enable PCLK\n"); + return ret; + } + if (!gwdt->use_extclk) + gwdt->clk_freq = clk_get_rate(gwdt->pclk); + } else { + dev_info(dev, "PCLK clock not found assume always-on\n"); + } + + gwdt->extclk = devm_clk_get(dev, "EXTCLK"); + if (!IS_ERR(gwdt->extclk)) { + /* Only enable and get frequency from EXTCLK if it's in use */ + if (gwdt->use_extclk) { + ret = clk_prepare_enable(gwdt->extclk); + if (ret) { + dev_err(&pdev->dev, + "unable to enable EXTCLK\n"); + return ret; + } + gwdt->clk_freq = clk_get_rate(gwdt->extclk); + } + } else { + if (of_device_is_compatible(np, "cortina,gemini-watchdog")) { + gwdt->clk_freq = 5000000; + gwdt->use_extclk = true; + dev_info(dev, "assume 5MHz EXTCLK on Gemini\n"); + } + } + + if (gwdt->clk_freq == 0) { + dev_err(dev, "no clocking available\n"); + return -EINVAL; + } + gwdt->dev = dev; gwdt->wdd.info = &ftwdt010_wdt_info; gwdt->wdd.ops = &ftwdt010_wdt_ops; gwdt->wdd.min_timeout = 1; - gwdt->wdd.max_timeout = 0xFFFFFFFF / WDT_CLOCK; + gwdt->wdd.max_timeout = UINT_MAX / gwdt->clk_freq; gwdt->wdd.parent = dev; /* @@ -178,7 +226,21 @@ static int ftwdt010_wdt_probe(struct platform_device *pdev) /* Set up platform driver data */ platform_set_drvdata(pdev, gwdt); - dev_info(dev, "FTWDT010 watchdog driver enabled\n"); + dev_info(dev, "FTWDT010 watchdog driver @%uHz\n", + gwdt->clk_freq); + + return 0; +} + +static int ftwdt010_wdt_remove(struct platform_device *pdev) +{ + struct ftwdt010_wdt *gwdt = platform_get_drvdata(pdev); + + writel(0, gwdt->base + FTWDT010_WDCR); + if (!IS_ERR(gwdt->pclk)) + clk_disable_unprepare(gwdt->pclk); + if (!IS_ERR(gwdt->extclk) && gwdt->use_extclk) + clk_disable_unprepare(gwdt->extclk); return 0; } @@ -225,6 +287,7 @@ MODULE_DEVICE_TABLE(of, ftwdt010_wdt_match); static struct platform_driver ftwdt010_wdt_driver = { .probe = ftwdt010_wdt_probe, + .remove = ftwdt010_wdt_remove, .driver = { .name = "ftwdt010-wdt", .of_match_table = of_match_ptr(ftwdt010_wdt_match), -- 2.13.4
WARNING: multiple messages have this Message-ID (diff)
From: linus.walleij@linaro.org (Linus Walleij) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/11] watchdog: ftwdt010: Add clock support Date: Sat, 12 Aug 2017 20:43:11 +0200 [thread overview] Message-ID: <20170812184318.10144-5-linus.walleij@linaro.org> (raw) In-Reply-To: <20170812184318.10144-1-linus.walleij@linaro.org> The Gemini platform now provides a proper clock look-up for this and other IPs, so add clock support to the driver. This also aids in using the same driver with other platforms such as MOXA ART. The IP has two clock inputs: PCLK (the IP peripheral clock) and EXTCLK (an external clock). We are a bit elaborate around this: on Gemini the EXTCLK is used by default today and it's 5MHz, and on MOXA ART the PCLK is used. On Aspeed the EXTCLK is used and it's 1MHz. So add some clever code to fall back to platform defaults if PCLK or EXTCLK is not provided by the device tree. Take this opportnity to implement .remove() for the driver that stops the watchdog and disables the clocks. Add credits that this code is inspired by MOXA ART. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/watchdog/ftwdt010_wdt.c | 79 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 71 insertions(+), 8 deletions(-) diff --git a/drivers/watchdog/ftwdt010_wdt.c b/drivers/watchdog/ftwdt010_wdt.c index ab38a3a89300..680279f5c679 100644 --- a/drivers/watchdog/ftwdt010_wdt.c +++ b/drivers/watchdog/ftwdt010_wdt.c @@ -5,6 +5,8 @@ * * Inspired by the out-of-tree drivers from OpenWRT: * Copyright (C) 2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt> + * Inspired by the MOXA ART driver from Jonas Jensen: + * Copyright (C) 2013 Jonas Jensen <jonas.jensen@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -18,9 +20,11 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/watchdog.h> +#include <linux/clk.h> #define FTWDT010_WDCOUNTER 0x0 #define FTWDT010_WDLOAD 0x4 @@ -29,19 +33,21 @@ #define WDRESTART_MAGIC 0x5AB9 -#define WDCR_CLOCK_5MHZ BIT(4) +#define WDCR_EXTCLK BIT(4) #define WDCR_WDEXT BIT(3) #define WDCR_WDINTR BIT(2) #define WDCR_SYS_RST BIT(1) #define WDCR_ENABLE BIT(0) -#define WDT_CLOCK 5000000 /* 5 MHz */ - struct ftwdt010_wdt { struct watchdog_device wdd; struct device *dev; void __iomem *base; bool has_irq; + struct clk *pclk; + struct clk *extclk; + unsigned int clk_freq; + bool use_extclk; }; static inline @@ -55,12 +61,13 @@ static int ftwdt010_wdt_start(struct watchdog_device *wdd) struct ftwdt010_wdt *gwdt = to_ftwdt010_wdt(wdd); u32 enable; - writel(wdd->timeout * WDT_CLOCK, gwdt->base + FTWDT010_WDLOAD); + writel(wdd->timeout * gwdt->clk_freq, gwdt->base + FTWDT010_WDLOAD); writel(WDRESTART_MAGIC, gwdt->base + FTWDT010_WDRESTART); /* set clock before enabling */ - enable = WDCR_CLOCK_5MHZ | WDCR_SYS_RST; + enable = WDCR_SYS_RST; + if (gwdt->use_extclk) + enable |= WDCR_EXTCLK; writel(enable, gwdt->base + FTWDT010_WDCR); - enable |= WDCR_CLOCK_5MHZ; if (gwdt->has_irq) enable |= WDCR_WDINTR; enable |= WDCR_ENABLE; @@ -125,6 +132,7 @@ static const struct watchdog_info ftwdt010_wdt_info = { static int ftwdt010_wdt_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; struct resource *res; struct ftwdt010_wdt *gwdt; unsigned int reg; @@ -140,11 +148,51 @@ static int ftwdt010_wdt_probe(struct platform_device *pdev) if (IS_ERR(gwdt->base)) return PTR_ERR(gwdt->base); + gwdt->use_extclk = of_property_read_bool(np, "faraday,use-extclk"); + + gwdt->pclk = devm_clk_get(dev, "PCLK"); + if (!IS_ERR(gwdt->pclk)) { + ret = clk_prepare_enable(gwdt->pclk); + if (ret) { + dev_err(&pdev->dev, "unable to enable PCLK\n"); + return ret; + } + if (!gwdt->use_extclk) + gwdt->clk_freq = clk_get_rate(gwdt->pclk); + } else { + dev_info(dev, "PCLK clock not found assume always-on\n"); + } + + gwdt->extclk = devm_clk_get(dev, "EXTCLK"); + if (!IS_ERR(gwdt->extclk)) { + /* Only enable and get frequency from EXTCLK if it's in use */ + if (gwdt->use_extclk) { + ret = clk_prepare_enable(gwdt->extclk); + if (ret) { + dev_err(&pdev->dev, + "unable to enable EXTCLK\n"); + return ret; + } + gwdt->clk_freq = clk_get_rate(gwdt->extclk); + } + } else { + if (of_device_is_compatible(np, "cortina,gemini-watchdog")) { + gwdt->clk_freq = 5000000; + gwdt->use_extclk = true; + dev_info(dev, "assume 5MHz EXTCLK on Gemini\n"); + } + } + + if (gwdt->clk_freq == 0) { + dev_err(dev, "no clocking available\n"); + return -EINVAL; + } + gwdt->dev = dev; gwdt->wdd.info = &ftwdt010_wdt_info; gwdt->wdd.ops = &ftwdt010_wdt_ops; gwdt->wdd.min_timeout = 1; - gwdt->wdd.max_timeout = 0xFFFFFFFF / WDT_CLOCK; + gwdt->wdd.max_timeout = UINT_MAX / gwdt->clk_freq; gwdt->wdd.parent = dev; /* @@ -178,7 +226,21 @@ static int ftwdt010_wdt_probe(struct platform_device *pdev) /* Set up platform driver data */ platform_set_drvdata(pdev, gwdt); - dev_info(dev, "FTWDT010 watchdog driver enabled\n"); + dev_info(dev, "FTWDT010 watchdog driver @%uHz\n", + gwdt->clk_freq); + + return 0; +} + +static int ftwdt010_wdt_remove(struct platform_device *pdev) +{ + struct ftwdt010_wdt *gwdt = platform_get_drvdata(pdev); + + writel(0, gwdt->base + FTWDT010_WDCR); + if (!IS_ERR(gwdt->pclk)) + clk_disable_unprepare(gwdt->pclk); + if (!IS_ERR(gwdt->extclk) && gwdt->use_extclk) + clk_disable_unprepare(gwdt->extclk); return 0; } @@ -225,6 +287,7 @@ MODULE_DEVICE_TABLE(of, ftwdt010_wdt_match); static struct platform_driver ftwdt010_wdt_driver = { .probe = ftwdt010_wdt_probe, + .remove = ftwdt010_wdt_remove, .driver = { .name = "ftwdt010-wdt", .of_match_table = of_match_ptr(ftwdt010_wdt_match), -- 2.13.4
next prev parent reply other threads:[~2017-08-12 18:43 UTC|newest] Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-08-12 18:43 [PATCH 00/11] watchdog: Consolidate FTWDT010 derivatives Linus Walleij 2017-08-12 18:43 ` Linus Walleij [not found] ` <20170812184318.10144-1-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-08-12 18:43 ` [PATCH 01/11] watchdog: gemini/ftwdt010: rename DT bindings Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` Linus Walleij [not found] ` <20170812184318.10144-2-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-08-14 14:55 ` Guenter Roeck 2017-08-14 14:55 ` Guenter Roeck 2017-08-14 14:55 ` Guenter Roeck 2017-08-17 20:32 ` Rob Herring 2017-08-17 20:32 ` Rob Herring 2017-08-17 20:32 ` Rob Herring 2017-08-12 18:43 ` [PATCH 06/11] watchdog: ftwdt010: Extend DT bindings to derivatives Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` Linus Walleij [not found] ` <20170812184318.10144-7-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> 2017-08-17 20:34 ` Rob Herring 2017-08-17 20:34 ` Rob Herring 2017-08-17 20:34 ` Rob Herring 2017-08-12 18:43 ` [PATCH 02/11] watchdog: gemini/ftwdt010: rename driver and symbols Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 15:01 ` Guenter Roeck 2017-08-14 15:01 ` Guenter Roeck 2017-08-24 20:45 ` Linus Walleij 2017-08-24 20:45 ` Linus Walleij 2017-08-27 17:14 ` Guenter Roeck 2017-08-27 17:14 ` Guenter Roeck 2017-08-12 18:43 ` [PATCH 03/11] watchdog: ftwdt010: Make interrupt optional Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 15:09 ` Guenter Roeck 2017-08-14 15:09 ` Guenter Roeck 2017-08-12 18:43 ` Linus Walleij [this message] 2017-08-12 18:43 ` [PATCH 04/11] watchdog: ftwdt010: Add clock support Linus Walleij 2017-08-14 16:05 ` Guenter Roeck 2017-08-14 16:05 ` Guenter Roeck 2017-08-24 20:32 ` Linus Walleij 2017-08-24 20:32 ` Linus Walleij 2017-08-25 23:28 ` Stephen Boyd 2017-08-25 23:28 ` Stephen Boyd 2017-08-27 17:12 ` Guenter Roeck 2017-08-27 17:12 ` Guenter Roeck 2017-08-27 17:06 ` Guenter Roeck 2017-08-27 17:06 ` Guenter Roeck 2017-10-10 19:51 ` Linus Walleij 2017-10-10 19:51 ` Linus Walleij 2017-10-10 20:06 ` Linus Walleij 2017-10-10 20:06 ` Linus Walleij 2017-10-12 3:39 ` Joel Stanley 2017-10-12 3:39 ` Joel Stanley 2017-08-12 18:43 ` [PATCH 05/11] watchdog: ftwdt010: Add restart support Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` [PATCH 07/11] watchdog: ftwdt010: Delete surplus bindings Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` [PATCH 08/11] watchdog: ftwdt010/moxart: Merge MOXA ART into FTWDT010 Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 16:09 ` Guenter Roeck 2017-08-14 16:09 ` Guenter Roeck 2017-08-24 20:34 ` Linus Walleij 2017-08-24 20:34 ` Linus Walleij 2017-08-12 18:43 ` [PATCH 09/11] watchdog: ftwdt010/aspeed: Merge Aspeed " Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-14 15:04 ` Guenter Roeck 2017-08-14 15:04 ` Guenter Roeck 2017-08-24 20:41 ` Linus Walleij 2017-08-24 20:41 ` Linus Walleij 2017-08-27 17:13 ` Guenter Roeck 2017-08-27 17:13 ` Guenter Roeck 2017-08-12 18:43 ` [PATCH 10/11] ARM: dts: fix PCLK name on Gemini and MOXA ART Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-08-12 18:43 ` [PATCH 11/11] ARM: dts: Add PCLK to the Aspeed watchdogs Linus Walleij 2017-08-12 18:43 ` Linus Walleij 2017-10-10 20:09 ` Linus Walleij 2017-10-10 20:09 ` Linus Walleij 2017-10-12 3:37 ` Joel Stanley 2017-10-12 3:37 ` Joel Stanley 2017-10-12 7:35 ` Linus Walleij 2017-10-12 7:35 ` Linus Walleij 2017-10-11 3:48 ` Andrew Jeffery 2017-10-11 3:48 ` Andrew Jeffery 2017-10-11 6:32 ` Linus Walleij 2017-10-11 6:32 ` Linus Walleij 2017-10-11 7:14 ` Andrew Jeffery 2017-10-11 7:14 ` Andrew Jeffery 2017-08-14 1:24 ` [PATCH 00/11] watchdog: Consolidate FTWDT010 derivatives Joel Stanley 2017-08-14 1:24 ` Joel Stanley 2017-08-14 3:08 ` Andrew Jeffery 2017-08-14 3:08 ` Andrew Jeffery 2017-08-14 12:36 ` Linus Walleij 2017-08-14 12:36 ` Linus Walleij 2017-08-14 12:31 ` Linus Walleij 2017-08-14 12:31 ` Linus Walleij 2017-08-14 12:39 ` Linus Walleij 2017-08-14 12:39 ` Linus Walleij
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=20170812184318.10144-5-linus.walleij@linaro.org \ --to=linus.walleij@linaro.org \ --cc=andrew@aj.id.au \ --cc=joel@jms.id.au \ --cc=jonas.jensen@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=wim@iguana.be \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.