mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
watchdog: qcom-wdt: disable pretimeout on timer platform
Some platform like ipq806x doesn't support pretimeout and define some interrupts used by qcom,msm-timer. Change the driver to check and use pretimeout only on qcom,kpss-wdt as it's the only platform that actually supports it. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20200204195648.23350-1-ansuelsmth@gmail.com [groeck: Conflict resolution] Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
This commit is contained in:
parent
fb33c6510d
commit
000de54171
1 changed files with 23 additions and 8 deletions
|
@ -40,6 +40,11 @@ static const u32 reg_offset_data_kpss[] = {
|
||||||
[WDT_BITE_TIME] = 0x14,
|
[WDT_BITE_TIME] = 0x14,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct qcom_wdt_match_data {
|
||||||
|
const u32 *offset;
|
||||||
|
bool pretimeout;
|
||||||
|
};
|
||||||
|
|
||||||
struct qcom_wdt {
|
struct qcom_wdt {
|
||||||
struct watchdog_device wdd;
|
struct watchdog_device wdd;
|
||||||
unsigned long rate;
|
unsigned long rate;
|
||||||
|
@ -179,19 +184,29 @@ static void qcom_clk_disable_unprepare(void *data)
|
||||||
clk_disable_unprepare(data);
|
clk_disable_unprepare(data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const struct qcom_wdt_match_data match_data_apcs_tmr = {
|
||||||
|
.offset = reg_offset_data_apcs_tmr,
|
||||||
|
.pretimeout = false,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct qcom_wdt_match_data match_data_kpss = {
|
||||||
|
.offset = reg_offset_data_kpss,
|
||||||
|
.pretimeout = true,
|
||||||
|
};
|
||||||
|
|
||||||
static int qcom_wdt_probe(struct platform_device *pdev)
|
static int qcom_wdt_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct device *dev = &pdev->dev;
|
struct device *dev = &pdev->dev;
|
||||||
struct qcom_wdt *wdt;
|
struct qcom_wdt *wdt;
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
struct device_node *np = dev->of_node;
|
struct device_node *np = dev->of_node;
|
||||||
const u32 *regs;
|
const struct qcom_wdt_match_data *data;
|
||||||
u32 percpu_offset;
|
u32 percpu_offset;
|
||||||
int irq, ret;
|
int irq, ret;
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
|
|
||||||
regs = of_device_get_match_data(dev);
|
data = of_device_get_match_data(dev);
|
||||||
if (!regs) {
|
if (!data) {
|
||||||
dev_err(dev, "Unsupported QCOM WDT module\n");
|
dev_err(dev, "Unsupported QCOM WDT module\n");
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
@ -247,7 +262,7 @@ static int qcom_wdt_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
/* check if there is pretimeout support */
|
/* check if there is pretimeout support */
|
||||||
irq = platform_get_irq_optional(pdev, 0);
|
irq = platform_get_irq_optional(pdev, 0);
|
||||||
if (irq > 0) {
|
if (data->pretimeout && irq > 0) {
|
||||||
ret = devm_request_irq(dev, irq, qcom_wdt_isr,
|
ret = devm_request_irq(dev, irq, qcom_wdt_isr,
|
||||||
IRQF_TRIGGER_RISING,
|
IRQF_TRIGGER_RISING,
|
||||||
"wdt_bark", &wdt->wdd);
|
"wdt_bark", &wdt->wdd);
|
||||||
|
@ -267,7 +282,7 @@ static int qcom_wdt_probe(struct platform_device *pdev)
|
||||||
wdt->wdd.min_timeout = 1;
|
wdt->wdd.min_timeout = 1;
|
||||||
wdt->wdd.max_timeout = 0x10000000U / wdt->rate;
|
wdt->wdd.max_timeout = 0x10000000U / wdt->rate;
|
||||||
wdt->wdd.parent = dev;
|
wdt->wdd.parent = dev;
|
||||||
wdt->layout = regs;
|
wdt->layout = data->offset;
|
||||||
|
|
||||||
if (readl(wdt_addr(wdt, WDT_STS)) & 1)
|
if (readl(wdt_addr(wdt, WDT_STS)) & 1)
|
||||||
wdt->wdd.bootstatus = WDIOF_CARDRESET;
|
wdt->wdd.bootstatus = WDIOF_CARDRESET;
|
||||||
|
@ -311,9 +326,9 @@ static int __maybe_unused qcom_wdt_resume(struct device *dev)
|
||||||
static SIMPLE_DEV_PM_OPS(qcom_wdt_pm_ops, qcom_wdt_suspend, qcom_wdt_resume);
|
static SIMPLE_DEV_PM_OPS(qcom_wdt_pm_ops, qcom_wdt_suspend, qcom_wdt_resume);
|
||||||
|
|
||||||
static const struct of_device_id qcom_wdt_of_table[] = {
|
static const struct of_device_id qcom_wdt_of_table[] = {
|
||||||
{ .compatible = "qcom,kpss-timer", .data = reg_offset_data_apcs_tmr },
|
{ .compatible = "qcom,kpss-timer", .data = &match_data_apcs_tmr },
|
||||||
{ .compatible = "qcom,scss-timer", .data = reg_offset_data_apcs_tmr },
|
{ .compatible = "qcom,scss-timer", .data = &match_data_apcs_tmr },
|
||||||
{ .compatible = "qcom,kpss-wdt", .data = reg_offset_data_kpss },
|
{ .compatible = "qcom,kpss-wdt", .data = &match_data_kpss },
|
||||||
{ },
|
{ },
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, qcom_wdt_of_table);
|
MODULE_DEVICE_TABLE(of, qcom_wdt_of_table);
|
||||||
|
|
Loading…
Reference in a new issue