From: Matthew McClintock <mmcclint@codeaurora.org>
To: andy.gross@linaro.org, linux-arm-msm@vger.kernel.org
Cc: qca-upstream.external@qca.qualcomm.com,
Matthew McClintock <mmcclint@codeaurora.org>,
Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>,
"open list:WATCHDOG DEVICE DRIVERS"
<linux-watchdog@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH 07/17] watchdog: qcom: add option for standalone watchdog not in timer block
Date: Wed, 23 Mar 2016 17:05:02 -0500 [thread overview]
Message-ID: <1458770712-10880-8-git-send-email-mmcclint@codeaurora.org> (raw)
In-Reply-To: <1458770712-10880-1-git-send-email-mmcclint@codeaurora.org>
Commit 0dfd582e026a ("watchdog: qcom: use timer devicetree binding") moved
to use the watchdog as a subset timer register block. Some devices have the
watchdog completely standalone with slightly different register offsets as
well so let's account for the differences here.
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
---
drivers/watchdog/qcom-wdt.c | 69 ++++++++++++++++++++++++++++++++-------------
1 file changed, 49 insertions(+), 20 deletions(-)
diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c
index 20563cc..e46f18d 100644
--- a/drivers/watchdog/qcom-wdt.c
+++ b/drivers/watchdog/qcom-wdt.c
@@ -19,17 +19,37 @@
#include <linux/platform_device.h>
#include <linux/watchdog.h>
-#define WDT_RST 0x38
-#define WDT_EN 0x40
-#define WDT_BITE_TIME 0x5C
+enum wdt_reg {
+ WDT_RST,
+ WDT_EN,
+ WDT_BITE_TIME,
+};
+
+static const u32 reg_offset_data_apcs_tmr[] = {
+ [WDT_RST] = 0x38,
+ [WDT_EN] = 0x40,
+ [WDT_BITE_TIME] = 0x5C,
+};
+
+static const u32 reg_offset_data_kpss[] = {
+ [WDT_RST] = 0x4,
+ [WDT_EN] = 0x8,
+ [WDT_BITE_TIME] = 0x14,
+};
struct qcom_wdt {
struct watchdog_device wdd;
struct clk *clk;
unsigned long rate;
void __iomem *base;
+ const u32 *layout;
};
+static void __iomem *wdt_addr(struct qcom_wdt *wdt, enum wdt_reg reg)
+{
+ return wdt->base + wdt->layout[reg];
+}
+
static inline
struct qcom_wdt *to_qcom_wdt(struct watchdog_device *wdd)
{
@@ -40,10 +60,10 @@ static int qcom_wdt_start(struct watchdog_device *wdd)
{
struct qcom_wdt *wdt = to_qcom_wdt(wdd);
- writel(0, wdt->base + WDT_EN);
- writel(1, wdt->base + WDT_RST);
- writel(wdd->timeout * wdt->rate, wdt->base + WDT_BITE_TIME);
- writel(1, wdt->base + WDT_EN);
+ writel(0, wdt_addr(wdt, WDT_EN));
+ writel(1, wdt_addr(wdt, WDT_RST));
+ writel(wdd->timeout * wdt->rate, wdt_addr(wdt, WDT_BITE_TIME));
+ writel(1, wdt_addr(wdt, WDT_EN));
return 0;
}
@@ -51,7 +71,7 @@ static int qcom_wdt_stop(struct watchdog_device *wdd)
{
struct qcom_wdt *wdt = to_qcom_wdt(wdd);
- writel(0, wdt->base + WDT_EN);
+ writel(0, wdt_addr(wdt, WDT_EN));
return 0;
}
@@ -59,7 +79,7 @@ static int qcom_wdt_ping(struct watchdog_device *wdd)
{
struct qcom_wdt *wdt = to_qcom_wdt(wdd);
- writel(1, wdt->base + WDT_RST);
+ writel(1, wdt_addr(wdt, WDT_RST));
return 0;
}
@@ -82,10 +102,10 @@ static int qcom_wdt_restart(struct watchdog_device *wdd, unsigned long action,
*/
timeout = 128 * wdt->rate / 1000;
- writel(0, wdt->base + WDT_EN);
- writel(1, wdt->base + WDT_RST);
- writel(timeout, wdt->base + WDT_BITE_TIME);
- writel(1, wdt->base + WDT_EN);
+ writel(0, wdt_addr(wdt, WDT_EN));
+ writel(1, wdt_addr(wdt, WDT_RST));
+ writel(timeout, wdt_addr(wdt, WDT_BITE_TIME));
+ writel(1, wdt_addr(wdt, WDT_EN));
/*
* Actually make sure the above sequence hits hardware before sleeping.
@@ -112,14 +132,29 @@ static const struct watchdog_info qcom_wdt_info = {
.identity = KBUILD_MODNAME,
};
+static const struct of_device_id qcom_wdt_of_table[] = {
+ { .compatible = "qcom,kpss-timer", .data = reg_offset_data_apcs_tmr },
+ { .compatible = "qcom,scss-timer", .data = reg_offset_data_apcs_tmr },
+ { .compatible = "qcom,kpss-standalone", .data = ®_offset_data_kpss},
+ { },
+};
+MODULE_DEVICE_TABLE(of, qcom_wdt_of_table);
+
static int qcom_wdt_probe(struct platform_device *pdev)
{
struct qcom_wdt *wdt;
struct resource *res;
struct device_node *np = pdev->dev.of_node;
+ const struct of_device_id *match;
u32 percpu_offset;
int ret;
+ match = of_match_node(qcom_wdt_of_table, np);
+ if (!match) {
+ dev_err(&pdev->dev, "Unsupported QCOM WDT module\n");
+ return -ENODEV;
+ }
+
wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
if (!wdt)
return -ENOMEM;
@@ -170,6 +205,7 @@ static int qcom_wdt_probe(struct platform_device *pdev)
wdt->wdd.min_timeout = 1;
wdt->wdd.max_timeout = 0x10000000U / wdt->rate;
wdt->wdd.parent = &pdev->dev;
+ wdt->layout = match->data;
/*
* If 'timeout-sec' unspecified in devicetree, assume a 30 second
@@ -202,13 +238,6 @@ static int qcom_wdt_remove(struct platform_device *pdev)
return 0;
}
-static const struct of_device_id qcom_wdt_of_table[] = {
- { .compatible = "qcom,kpss-timer" },
- { .compatible = "qcom,scss-timer" },
- { },
-};
-MODULE_DEVICE_TABLE(of, qcom_wdt_of_table);
-
static struct platform_driver qcom_watchdog_driver = {
.probe = qcom_wdt_probe,
.remove = qcom_wdt_remove,
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-03-23 22:05 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 22:04 [PATCH 00/17] Additional IPQ4019 platform support Matthew McClintock
2016-03-23 22:04 ` [PATCH 01/17] pinctrl: qcom: ipq4019: set ngpios to correct value Matthew McClintock
2016-03-25 21:19 ` Bjorn Andersson
2016-03-31 9:53 ` Linus Walleij
2016-03-23 22:04 ` [PATCH 02/17] pinctrl: qcom: ipq4019: fix the function enum for gpio mode Matthew McClintock
2016-03-25 21:22 ` Bjorn Andersson
2016-03-31 9:55 ` Linus Walleij
2016-03-23 22:04 ` [PATCH 03/17] pinctrl: qcom: ipq4019: fix register offsets Matthew McClintock
2016-03-25 21:31 ` Bjorn Andersson
2016-03-31 9:57 ` Linus Walleij
2016-03-23 22:04 ` [PATCH 04/17] clk: qcom: ipq4019: switch remaining defines to enums Matthew McClintock
2016-03-29 23:31 ` Stephen Boyd
2016-03-23 22:05 ` [PATCH 05/17] clk: qcom: ipq4019: add some fixed clocks for ddrppl and fepll Matthew McClintock
2016-03-29 23:31 ` Stephen Boyd
[not found] ` <1458770712-10880-1-git-send-email-mmcclint-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2016-03-23 22:05 ` [PATCH 06/17] watchdog: qcom: update device tree bindings Matthew McClintock
2016-03-23 22:26 ` Stephen Boyd
2016-03-24 15:49 ` Matthew McClintock
[not found] ` <1458770712-10880-7-git-send-email-mmcclint-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2016-03-25 14:13 ` Rob Herring
2016-03-23 22:05 ` [PATCH 09/17] watchdog: qcom: add kpss-standalone to device tree binding Matthew McClintock
2016-03-25 14:15 ` Rob Herring
2016-03-28 17:02 ` Matthew McClintock
2016-03-28 17:26 ` Rob Herring
2016-03-28 18:15 ` Guenter Roeck
[not found] ` <20160328181544.GB29820-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2016-03-28 22:22 ` Matthew McClintock
2016-03-23 22:05 ` [PATCH 15/17] qcom: ipq4019: add cpu operating points for cpufreq support Matthew McClintock
[not found] ` <1458770712-10880-16-git-send-email-mmcclint-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2016-03-23 22:33 ` Stephen Boyd
2017-03-22 14:10 ` [15/17] " Sven Eckelmann
2016-03-23 22:05 ` Matthew McClintock [this message]
[not found] ` <1458770712-10880-8-git-send-email-mmcclint-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2016-03-23 22:40 ` [PATCH 07/17] watchdog: qcom: add option for standalone watchdog not in timer block Stephen Boyd
2016-03-25 16:23 ` Guenter Roeck
[not found] ` <20160325162326.GA25767-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2016-03-28 16:55 ` Matthew McClintock
[not found] ` <D54FA5B6-F170-40D3-BF0D-60D40A2C2829-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2016-03-28 18:13 ` Guenter Roeck
2016-03-28 20:40 ` Matthew McClintock
2016-03-28 21:56 ` Guenter Roeck
[not found] ` <20160328215638.GA25221-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2016-03-28 22:21 ` Matthew McClintock
2016-03-23 22:05 ` [PATCH 08/17] watchdog: qcom: configure BARK time in addition to BITE time Matthew McClintock
[not found] ` <1458770712-10880-9-git-send-email-mmcclint-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2016-03-23 22:42 ` Stephen Boyd
2016-03-24 15:46 ` Matthew McClintock
2016-03-24 16:17 ` Guenter Roeck
2016-03-24 19:49 ` Matthew McClintock
2016-04-07 7:02 ` Guenter Roeck
2016-03-23 22:05 ` [PATCH 10/17] qcom: ipq4019: add watchdog node to ipq4019 SoC and DK01 device tree Matthew McClintock
2016-03-23 22:05 ` [PATCH 11/17] qcom: ipq4019: add support for reset via qcom,ps-hold Matthew McClintock
2016-03-23 22:05 ` [PATCH 12/17] qcom: ipq4019: add spi node to ipq4019 SoC and DK01 device tree Matthew McClintock
2016-03-23 22:05 ` [PATCH 13/17] qcom: ipq4019: add i2c " Matthew McClintock
2016-03-23 22:05 ` [PATCH 14/17] cpufreq: ipq4019: add cpufreq driver Matthew McClintock
2016-03-24 6:44 ` Viresh Kumar
2016-03-24 15:42 ` Matthew McClintock
2016-03-23 22:05 ` [PATCH 16/17] qcom: ipq4019: add crypto nodes to ipq4019 SoC and DK01 device tree Matthew McClintock
2016-03-23 22:05 ` [PATCH 17/17] qcom: ipq4019: add DMA " Matthew McClintock
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=1458770712-10880-8-git-send-email-mmcclint@codeaurora.org \
--to=mmcclint@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=qca-upstream.external@qca.qualcomm.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 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).