From: Crystal Guo <crystal.guo@mediatek.com>
To: <linux@roeck-us.net>, <robh+dt@kernel.org>, <matthias.bgg@gmail.com>
Cc: <srv_heupstream@mediatek.com>,
<linux-mediatek@lists.infradead.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <linux-watchdog@vger.kernel.org>,
<seiya.wang@mediatek.com>, Crystal Guo <crystal.guo@mediatek.com>
Subject: [PATCH 1/3] watchdog: mtk_wdt: remove mt8xxx-resets.h
Date: Tue, 28 Jul 2020 18:42:27 +0800 [thread overview]
Message-ID: <1595932949-7033-1-git-send-email-crystal.guo@mediatek.com> (raw)
mt8xxx-resets.h actually just used to define TOPRGU_SW_RST_NUM.
Instead of resubmit the mt8xxx-reset.h for a new IC, get the number
of reset bits from dtsi is more easier to maintain.
Signed-off-by: Crystal Guo <crystal.guo@mediatek.com>
---
drivers/watchdog/mtk_wdt.c | 26 +++++---------------------
1 file changed, 5 insertions(+), 21 deletions(-)
diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index d6a6393..adc88c2 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -9,8 +9,6 @@
* Based on sunxi_wdt.c
*/
-#include <dt-bindings/reset-controller/mt2712-resets.h>
-#include <dt-bindings/reset-controller/mt8183-resets.h>
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/init.h>
@@ -64,18 +62,6 @@ struct mtk_wdt_dev {
struct reset_controller_dev rcdev;
};
-struct mtk_wdt_data {
- int toprgu_sw_rst_num;
-};
-
-static const struct mtk_wdt_data mt2712_data = {
- .toprgu_sw_rst_num = MT2712_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)
{
@@ -248,7 +234,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;
+ u32 toprgu_sw_rst_num;
int err;
mtk_wdt = devm_kzalloc(dev, sizeof(*mtk_wdt), GFP_KERNEL);
@@ -284,10 +270,10 @@ 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);
+ err = of_property_read_u32(pdev->dev.of_node, "rst-num",
+ &toprgu_sw_rst_num);
+ if (!err) {
+ err = toprgu_register_reset_controller(pdev, toprgu_sw_rst_num);
if (err)
return err;
}
@@ -319,9 +305,7 @@ static int mtk_wdt_resume(struct device *dev)
#endif
static const struct of_device_id mtk_wdt_dt_ids[] = {
- { .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data },
{ .compatible = "mediatek,mt6589-wdt" },
- { .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
--
1.8.1.1.dirty
next reply other threads:[~2020-07-28 10:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 10:42 Crystal Guo [this message]
2020-07-28 10:42 ` [PATCH 2/3] dt-bindings: watchdog: Add rst-num property Crystal Guo
2020-07-28 10:42 ` [PATCH 3/3] arm64: dts: mt8183: " Crystal Guo
2020-07-28 11:43 ` [PATCH 1/3] watchdog: mtk_wdt: remove mt8xxx-resets.h Matthias Brugger
2020-07-28 14:42 ` 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=1595932949-7033-1-git-send-email-crystal.guo@mediatek.com \
--to=crystal.guo@mediatek.com \
--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=robh+dt@kernel.org \
--cc=seiya.wang@mediatek.com \
--cc=srv_heupstream@mediatek.com \
/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
all inboxes | Powered by JetHome®