From: Yong Liang <yong.liang@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>
Cc: "wim@linux-watchdog.org" <wim@linux-watchdog.org>,
"linux@roeck-us.net" <linux@roeck-us.net>,
"p.zabel@pengutronix.de" <p.zabel@pengutronix.de>,
"linux-watchdog@vger.kernel.org" <linux-watchdog@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-mediatek@lists.infradead.org"
<linux-mediatek@lists.infradead.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"Chang-An Chen (陳昶安)" <Chang-An.Chen@mediatek.com>,
"Freddy Hsin (辛恒豐)" <Freddy.Hsin@mediatek.com>,
"Jiaxin Yu (俞家鑫)" <Jiaxin.Yu@mediatek.com>,
"Yingjoe Chen (陳英洲)" <Yingjoe.Chen@mediatek.com>,
"sboyd@kernel.org" <sboyd@kernel.org>
Subject: Re: [PATCH v12 3/4] watchdog: mtk_wdt: mt8183: Add reset controller
Date: Sun, 19 Jan 2020 11:22:36 +0800 [thread overview]
Message-ID: <1579404156.27500.1.camel@mhfsdcap03> (raw)
In-Reply-To: <372a4c8e-2ff1-3424-069c-7d359e1f16f1@gmail.com>
On Thu, 2020-01-16 at 00:18 +0800, Matthias Brugger wrote:
>
> On 15/01/2020 09:58, Yong Liang wrote:
> > From: "yong.liang" <yong.liang@mediatek.com>
> >
> > Add reset controller API in watchdog driver.
> > Besides watchdog, MTK toprgu module alsa provide sub-system (eg, audio,
> > camera, codec and connectivity) software reset functionality.
> >
> > Signed-off-by: yong.liang <yong.liang@mediatek.com>
> > Signed-off-by: Jiaxin Yu <jiaxin.yu@mediatek.com>
> > Reviewed-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
> > Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
>
> Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
May I need send a new patch whith this tag?
>
> > ---
> > drivers/watchdog/mtk_wdt.c | 99 +++++++++++++++++++++++++++++++++++++-
> > 1 file changed, 98 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
> > index 9c3d0033260d..e88aacb0404d 100644
> > --- a/drivers/watchdog/mtk_wdt.c
> > +++ b/drivers/watchdog/mtk_wdt.c
> > @@ -9,6 +9,8 @@
> > * Based on sunxi_wdt.c
> > */
> >
> > +#include <dt-bindings/reset-controller/mt8183-resets.h>
> > +#include <linux/delay.h>
> > #include <linux/err.h>
> > #include <linux/init.h>
> > #include <linux/io.h>
> > @@ -16,10 +18,11 @@
> > #include <linux/module.h>
> > #include <linux/moduleparam.h>
> > #include <linux/of.h>
> > +#include <linux/of_device.h>
> > #include <linux/platform_device.h>
> > +#include <linux/reset-controller.h>
> > #include <linux/types.h>
> > #include <linux/watchdog.h>
> > -#include <linux/delay.h>
> >
> > #define WDT_MAX_TIMEOUT 31
> > #define WDT_MIN_TIMEOUT 1
> > @@ -44,6 +47,9 @@
> > #define WDT_SWRST 0x14
> > #define WDT_SWRST_KEY 0x1209
> >
> > +#define WDT_SWSYSRST 0x18U
> > +#define WDT_SWSYS_RST_KEY 0x88000000
> > +
> > #define DRV_NAME "mtk-wdt"
> > #define DRV_VERSION "1.0"
> >
> > @@ -53,8 +59,90 @@ static unsigned int timeout;
> > struct mtk_wdt_dev {
> > struct watchdog_device wdt_dev;
> > void __iomem *wdt_base;
> > + spinlock_t lock; /* protects WDT_SWSYSRST reg */
> > + struct reset_controller_dev rcdev;
> > +};
> > +
> > +struct mtk_wdt_data {
> > + int toprgu_sw_rst_num;
> > };
> >
> > +static const struct mtk_wdt_data mt8183_data = {
> > + .toprgu_sw_rst_num = MT8183_TOPRGU_SW_RST_NUM,
> > +};
> > +
> > +static int toprgu_reset_update(struct reset_controller_dev *rcdev,
> > + unsigned long id, bool assert)
> > +{
> > + unsigned int tmp;
> > + unsigned long flags;
> > + struct mtk_wdt_dev *data =
> > + container_of(rcdev, struct mtk_wdt_dev, rcdev);
> > +
> > + spin_lock_irqsave(&data->lock, flags);
> > +
> > + tmp = readl(data->wdt_base + WDT_SWSYSRST);
> > + if (assert)
> > + tmp |= BIT(id);
> > + else
> > + tmp &= ~BIT(id);
> > + tmp |= WDT_SWSYS_RST_KEY;
> > + writel(tmp, data->wdt_base + WDT_SWSYSRST);
> > +
> > + spin_unlock_irqrestore(&data->lock, flags);
> > +
> > + return 0;
> > +}
> > +
> > +static int toprgu_reset_assert(struct reset_controller_dev *rcdev,
> > + unsigned long id)
> > +{
> > + return toprgu_reset_update(rcdev, id, true);
> > +}
> > +
> > +static int toprgu_reset_deassert(struct reset_controller_dev *rcdev,
> > + unsigned long id)
> > +{
> > + return toprgu_reset_update(rcdev, id, false);
> > +}
> > +
> > +static int toprgu_reset(struct reset_controller_dev *rcdev,
> > + unsigned long id)
> > +{
> > + int ret;
> > +
> > + ret = toprgu_reset_assert(rcdev, id);
> > + if (ret)
> > + return ret;
> > +
> > + return toprgu_reset_deassert(rcdev, id);
> > +}
> > +
> > +static const struct reset_control_ops toprgu_reset_ops = {
> > + .assert = toprgu_reset_assert,
> > + .deassert = toprgu_reset_deassert,
> > + .reset = toprgu_reset,
> > +};
> > +
> > +static int toprgu_register_reset_controller(struct platform_device *pdev,
> > + int rst_num)
> > +{
> > + int ret;
> > + struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
> > +
> > + spin_lock_init(&mtk_wdt->lock);
> > +
> > + mtk_wdt->rcdev.owner = THIS_MODULE;
> > + mtk_wdt->rcdev.nr_resets = rst_num;
> > + mtk_wdt->rcdev.ops = &toprgu_reset_ops;
> > + mtk_wdt->rcdev.of_node = pdev->dev.of_node;
> > + ret = devm_reset_controller_register(&pdev->dev, &mtk_wdt->rcdev);
> > + if (ret != 0)
> > + dev_err(&pdev->dev,
> > + "couldn't register wdt reset controller: %d\n", ret);
> > + return ret;
> > +}
> > +
> > static int mtk_wdt_restart(struct watchdog_device *wdt_dev,
> > unsigned long action, void *data)
> > {
> > @@ -155,6 +243,7 @@ static int mtk_wdt_probe(struct platform_device *pdev)
> > {
> > struct device *dev = &pdev->dev;
> > struct mtk_wdt_dev *mtk_wdt;
> > + const struct mtk_wdt_data *wdt_data;
> > int err;
> >
> > mtk_wdt = devm_kzalloc(dev, sizeof(*mtk_wdt), GFP_KERNEL);
> > @@ -190,6 +279,13 @@ static int mtk_wdt_probe(struct platform_device *pdev)
> > dev_info(dev, "Watchdog enabled (timeout=%d sec, nowayout=%d)\n",
> > mtk_wdt->wdt_dev.timeout, nowayout);
> >
> > + wdt_data = of_device_get_match_data(dev);
> > + if (wdt_data) {
> > + err = toprgu_register_reset_controller(pdev,
> > + wdt_data->toprgu_sw_rst_num);
> > + if (err)
> > + return err;
> > + }
> > return 0;
> > }
> >
> > @@ -219,6 +315,7 @@ static int mtk_wdt_resume(struct device *dev)
> >
> > static const struct of_device_id mtk_wdt_dt_ids[] = {
> > { .compatible = "mediatek,mt6589-wdt" },
> > + { .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data },
> > { /* sentinel */ }
> > };
> > MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
> >
next prev parent reply other threads:[~2020-01-19 3:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 8:58 [PATCH v12 0/4] ASoC: mt8183: fix audio playback slowly after playback Yong Liang
2020-01-15 8:58 ` [PATCH v12 1/4] dt-bindings: mediatek: mt8183: Add #reset-cells Yong Liang
2020-01-15 8:58 ` [PATCH v12 2/4] dt-bindings: mediatek: mt2712: " Yong Liang
2020-01-15 8:58 ` [PATCH v12 3/4] watchdog: mtk_wdt: mt8183: Add reset controller Yong Liang
2020-01-15 13:47 ` Guenter Roeck
2020-01-15 16:18 ` Matthias Brugger
2020-01-19 3:22 ` Yong Liang [this message]
2020-01-15 8:58 ` [PATCH v12 4/4] watchdog: mtk_wdt: mt2712: " Yong Liang
2020-01-15 16:18 ` Matthias Brugger
2020-01-19 3:21 ` Yong Liang
2020-01-23 20:54 ` Guenter Roeck
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=1579404156.27500.1.camel@mhfsdcap03 \
--to=yong.liang@mediatek.com \
--cc=Chang-An.Chen@mediatek.com \
--cc=Freddy.Hsin@mediatek.com \
--cc=Jiaxin.Yu@mediatek.com \
--cc=Yingjoe.Chen@mediatek.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=matthias.bgg@gmail.com \
--cc=p.zabel@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=wim@linux-watchdog.org \
/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;
as well as URLs for NNTP newsgroup(s).