From: Eddie Huang <eddie.huang@mediatek.com>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: Matthias Brugger <matthias.bgg@gmail.com>,
<linux-watchdog@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Sascha Hauer <kernel@pengutronix.de>,
Greta Zhang <greta.zhang@mediatek.com>,
Roger Lu <roger.lu@mediatek.com>,
Eddie Huang <eddie.huang@mediatek.com>
Subject: [PATCH 1/2] watchdog: add wdt suspend/resume support
Date: Wed, 22 Jul 2015 11:26:49 +0800 [thread overview]
Message-ID: <1437535610-51314-2-git-send-email-eddie.huang@mediatek.com> (raw)
In-Reply-To: <1437535610-51314-1-git-send-email-eddie.huang@mediatek.com>
From: Greta Zhang <greta.zhang@mediatek.com>
add wdt driver suspend/resume support
Signed-off-by: Greta Zhang <greta.zhang@mediatek.com>
Signed-off-by: Roger Lu <roger.lu@mediatek.com>
Signed-off-by: Eddie Huang <eddie.huang@mediatek.com>
---
drivers/watchdog/mtk_wdt.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 938b987..5ef3910 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -65,6 +65,7 @@ struct mtk_wdt_dev {
struct watchdog_device wdt_dev;
void __iomem *wdt_base;
struct notifier_block restart_handler;
+ bool started;
};
static int mtk_reset_handler(struct notifier_block *this, unsigned long mode,
@@ -125,6 +126,8 @@ static int mtk_wdt_stop(struct watchdog_device *wdt_dev)
reg &= ~WDT_MODE_EN;
iowrite32(reg, wdt_base + WDT_MODE);
+ mtk_wdt->started = false;
+
return 0;
}
@@ -135,6 +138,8 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev)
void __iomem *wdt_base = mtk_wdt->wdt_base;
int ret;
+ mtk_wdt->started = true;
+
ret = mtk_wdt_set_timeout(wdt_dev, wdt_dev->timeout);
if (ret < 0)
return ret;
@@ -174,6 +179,8 @@ static int mtk_wdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mtk_wdt);
+ mtk_wdt->started = false;
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mtk_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mtk_wdt->wdt_base))
@@ -221,6 +228,35 @@ static int mtk_wdt_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PM
+static int mtk_wdt_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+ if (mtk_wdt->started) {
+ mtk_wdt_stop(&mtk_wdt->wdt_dev);
+ mtk_wdt->started = true;
+ }
+
+ return 0;
+}
+
+static int mtk_wdt_resume(struct platform_device *pdev)
+{
+ struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+ if (mtk_wdt->started) {
+ mtk_wdt_start(&mtk_wdt->wdt_dev);
+ mtk_wdt_ping(&mtk_wdt->wdt_dev);
+ }
+
+ return 0;
+}
+#else
+#define mtk_wdt_suspend NULL
+#define mtk_wdt_resume NULL
+#endif
+
static const struct of_device_id mtk_wdt_dt_ids[] = {
{ .compatible = "mediatek,mt6589-wdt" },
{ /* sentinel */ }
@@ -230,6 +266,8 @@ MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
static struct platform_driver mtk_wdt_driver = {
.probe = mtk_wdt_probe,
.remove = mtk_wdt_remove,
+ .suspend = mtk_wdt_suspend,
+ .resume = mtk_wdt_resume,
.driver = {
.name = DRV_NAME,
.of_match_table = mtk_wdt_dt_ids,
--
1.8.1.1.dirty
WARNING: multiple messages have this Message-ID (diff)
From: Eddie Huang <eddie.huang@mediatek.com>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: Matthias Brugger <matthias.bgg@gmail.com>,
linux-watchdog@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
Sascha Hauer <kernel@pengutronix.de>,
Greta Zhang <greta.zhang@mediatek.com>,
Roger Lu <roger.lu@mediatek.com>,
Eddie Huang <eddie.huang@mediatek.com>
Subject: [PATCH 1/2] watchdog: add wdt suspend/resume support
Date: Wed, 22 Jul 2015 11:26:49 +0800 [thread overview]
Message-ID: <1437535610-51314-2-git-send-email-eddie.huang@mediatek.com> (raw)
In-Reply-To: <1437535610-51314-1-git-send-email-eddie.huang@mediatek.com>
From: Greta Zhang <greta.zhang@mediatek.com>
add wdt driver suspend/resume support
Signed-off-by: Greta Zhang <greta.zhang@mediatek.com>
Signed-off-by: Roger Lu <roger.lu@mediatek.com>
Signed-off-by: Eddie Huang <eddie.huang@mediatek.com>
---
drivers/watchdog/mtk_wdt.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 938b987..5ef3910 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -65,6 +65,7 @@ struct mtk_wdt_dev {
struct watchdog_device wdt_dev;
void __iomem *wdt_base;
struct notifier_block restart_handler;
+ bool started;
};
static int mtk_reset_handler(struct notifier_block *this, unsigned long mode,
@@ -125,6 +126,8 @@ static int mtk_wdt_stop(struct watchdog_device *wdt_dev)
reg &= ~WDT_MODE_EN;
iowrite32(reg, wdt_base + WDT_MODE);
+ mtk_wdt->started = false;
+
return 0;
}
@@ -135,6 +138,8 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev)
void __iomem *wdt_base = mtk_wdt->wdt_base;
int ret;
+ mtk_wdt->started = true;
+
ret = mtk_wdt_set_timeout(wdt_dev, wdt_dev->timeout);
if (ret < 0)
return ret;
@@ -174,6 +179,8 @@ static int mtk_wdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mtk_wdt);
+ mtk_wdt->started = false;
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mtk_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mtk_wdt->wdt_base))
@@ -221,6 +228,35 @@ static int mtk_wdt_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PM
+static int mtk_wdt_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+ if (mtk_wdt->started) {
+ mtk_wdt_stop(&mtk_wdt->wdt_dev);
+ mtk_wdt->started = true;
+ }
+
+ return 0;
+}
+
+static int mtk_wdt_resume(struct platform_device *pdev)
+{
+ struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+ if (mtk_wdt->started) {
+ mtk_wdt_start(&mtk_wdt->wdt_dev);
+ mtk_wdt_ping(&mtk_wdt->wdt_dev);
+ }
+
+ return 0;
+}
+#else
+#define mtk_wdt_suspend NULL
+#define mtk_wdt_resume NULL
+#endif
+
static const struct of_device_id mtk_wdt_dt_ids[] = {
{ .compatible = "mediatek,mt6589-wdt" },
{ /* sentinel */ }
@@ -230,6 +266,8 @@ MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
static struct platform_driver mtk_wdt_driver = {
.probe = mtk_wdt_probe,
.remove = mtk_wdt_remove,
+ .suspend = mtk_wdt_suspend,
+ .resume = mtk_wdt_resume,
.driver = {
.name = DRV_NAME,
.of_match_table = mtk_wdt_dt_ids,
--
1.8.1.1.dirty
WARNING: multiple messages have this Message-ID (diff)
From: eddie.huang@mediatek.com (Eddie Huang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] watchdog: add wdt suspend/resume support
Date: Wed, 22 Jul 2015 11:26:49 +0800 [thread overview]
Message-ID: <1437535610-51314-2-git-send-email-eddie.huang@mediatek.com> (raw)
In-Reply-To: <1437535610-51314-1-git-send-email-eddie.huang@mediatek.com>
From: Greta Zhang <greta.zhang@mediatek.com>
add wdt driver suspend/resume support
Signed-off-by: Greta Zhang <greta.zhang@mediatek.com>
Signed-off-by: Roger Lu <roger.lu@mediatek.com>
Signed-off-by: Eddie Huang <eddie.huang@mediatek.com>
---
drivers/watchdog/mtk_wdt.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 938b987..5ef3910 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -65,6 +65,7 @@ struct mtk_wdt_dev {
struct watchdog_device wdt_dev;
void __iomem *wdt_base;
struct notifier_block restart_handler;
+ bool started;
};
static int mtk_reset_handler(struct notifier_block *this, unsigned long mode,
@@ -125,6 +126,8 @@ static int mtk_wdt_stop(struct watchdog_device *wdt_dev)
reg &= ~WDT_MODE_EN;
iowrite32(reg, wdt_base + WDT_MODE);
+ mtk_wdt->started = false;
+
return 0;
}
@@ -135,6 +138,8 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev)
void __iomem *wdt_base = mtk_wdt->wdt_base;
int ret;
+ mtk_wdt->started = true;
+
ret = mtk_wdt_set_timeout(wdt_dev, wdt_dev->timeout);
if (ret < 0)
return ret;
@@ -174,6 +179,8 @@ static int mtk_wdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mtk_wdt);
+ mtk_wdt->started = false;
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mtk_wdt->wdt_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mtk_wdt->wdt_base))
@@ -221,6 +228,35 @@ static int mtk_wdt_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PM
+static int mtk_wdt_suspend(struct platform_device *pdev, pm_message_t state)
+{
+ struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+ if (mtk_wdt->started) {
+ mtk_wdt_stop(&mtk_wdt->wdt_dev);
+ mtk_wdt->started = true;
+ }
+
+ return 0;
+}
+
+static int mtk_wdt_resume(struct platform_device *pdev)
+{
+ struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+ if (mtk_wdt->started) {
+ mtk_wdt_start(&mtk_wdt->wdt_dev);
+ mtk_wdt_ping(&mtk_wdt->wdt_dev);
+ }
+
+ return 0;
+}
+#else
+#define mtk_wdt_suspend NULL
+#define mtk_wdt_resume NULL
+#endif
+
static const struct of_device_id mtk_wdt_dt_ids[] = {
{ .compatible = "mediatek,mt6589-wdt" },
{ /* sentinel */ }
@@ -230,6 +266,8 @@ MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
static struct platform_driver mtk_wdt_driver = {
.probe = mtk_wdt_probe,
.remove = mtk_wdt_remove,
+ .suspend = mtk_wdt_suspend,
+ .resume = mtk_wdt_resume,
.driver = {
.name = DRV_NAME,
.of_match_table = mtk_wdt_dt_ids,
--
1.8.1.1.dirty
next prev parent reply other threads:[~2015-07-22 3:27 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-22 3:26 [PATCH 0/2] Add Mediatek watchdog suspend resume and shutdown Eddie Huang
2015-07-22 3:26 ` Eddie Huang
2015-07-22 3:26 ` Eddie Huang
2015-07-22 3:26 ` Eddie Huang [this message]
2015-07-22 3:26 ` [PATCH 1/2] watchdog: add wdt suspend/resume support Eddie Huang
2015-07-22 3:26 ` Eddie Huang
2015-07-22 3:45 ` Guenter Roeck
2015-07-22 3:45 ` Guenter Roeck
2015-07-22 3:45 ` Guenter Roeck
2015-07-23 4:45 ` Eddie Huang
2015-07-23 4:45 ` Eddie Huang
2015-07-23 4:45 ` Eddie Huang
2015-07-22 3:26 ` [PATCH 2/2] watchdog: add wdt shutdown callback to disable wdt if enabled Eddie Huang
2015-07-22 3:26 ` Eddie Huang
2015-07-22 3:26 ` Eddie Huang
2015-07-22 3:48 ` Guenter Roeck
2015-07-22 3:48 ` Guenter Roeck
2015-07-22 3:48 ` 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=1437535610-51314-2-git-send-email-eddie.huang@mediatek.com \
--to=eddie.huang@mediatek.com \
--cc=greta.zhang@mediatek.com \
--cc=kernel@pengutronix.de \
--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=matthias.bgg@gmail.com \
--cc=roger.lu@mediatek.com \
--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: link
Be 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.