Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: sama5d4: Cache MR instead of a partial config

Browse Source 
.config is used to cache a part of WDT_MR at probe time and is not used
afterwards. Instead of doing that, actually cache MR and avoid reading it
every time it is modified.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Alexandre Belloni 2017-01-30 18:18:47 +01:00 committed by Guenter Roeck
parent 8f8dc7bf3e
commit 722ce6356d
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/watchdog/sama5d4_wdt.c
View File

@ -28,7 +28,7 @@
struct sama5d4_wdt { struct sama5d4_wdt {
struct watchdog_device wdd; struct watchdog_device wdd;
void __iomem *reg_base; void __iomem *reg_base;
u32 config; u32 mr;
}; };
static int wdt_timeout = WDT_DEFAULT_TIMEOUT; static int wdt_timeout = WDT_DEFAULT_TIMEOUT;
@ -53,11 +53,9 @@ MODULE_PARM_DESC(nowayout,
static int sama5d4_wdt_start(struct watchdog_device *wdd) static int sama5d4_wdt_start(struct watchdog_device *wdd)
{ {
struct sama5d4_wdt *wdt = watchdog_get_drvdata(wdd); struct sama5d4_wdt *wdt = watchdog_get_drvdata(wdd);
u32 reg;
reg = wdt_read(wdt, AT91_WDT_MR); wdt->mr &= ~AT91_WDT_WDDIS;
reg &= ~AT91_WDT_WDDIS; wdt_write(wdt, AT91_WDT_MR, wdt->mr);
wdt_write(wdt, AT91_WDT_MR, reg);
return 0; return 0;
} }
@ -65,11 +63,9 @@ static int sama5d4_wdt_start(struct watchdog_device *wdd)
static int sama5d4_wdt_stop(struct watchdog_device *wdd) static int sama5d4_wdt_stop(struct watchdog_device *wdd)
{ {
struct sama5d4_wdt *wdt = watchdog_get_drvdata(wdd); struct sama5d4_wdt *wdt = watchdog_get_drvdata(wdd);
u32 reg;
reg = wdt_read(wdt, AT91_WDT_MR); wdt->mr |= AT91_WDT_WDDIS;
reg |= AT91_WDT_WDDIS; wdt_write(wdt, AT91_WDT_MR, wdt->mr);
wdt_write(wdt, AT91_WDT_MR, reg);
return 0; return 0;
} }
@ -88,14 +84,12 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,
{ {
struct sama5d4_wdt *wdt = watchdog_get_drvdata(wdd); struct sama5d4_wdt *wdt = watchdog_get_drvdata(wdd);
u32 value = WDT_SEC2TICKS(timeout); u32 value = WDT_SEC2TICKS(timeout);
u32 reg;
reg = wdt_read(wdt, AT91_WDT_MR); wdt->mr &= ~AT91_WDT_WDV;
reg &= ~AT91_WDT_WDV; wdt->mr &= ~AT91_WDT_WDD;
reg &= ~AT91_WDT_WDD; wdt->mr |= AT91_WDT_SET_WDV(value);
reg |= AT91_WDT_SET_WDV(value); wdt->mr |= AT91_WDT_SET_WDD(value);
reg |= AT91_WDT_SET_WDD(value); wdt_write(wdt, AT91_WDT_MR, wdt->mr);
wdt_write(wdt, AT91_WDT_MR, reg);
wdd->timeout = timeout; wdd->timeout = timeout;
@ -132,19 +126,19 @@ static int of_sama5d4_wdt_init(struct device_node *np, struct sama5d4_wdt *wdt)
{ {
const char *tmp; const char *tmp;
wdt->config = AT91_WDT_WDDIS; wdt->mr = AT91_WDT_WDDIS;
if (!of_property_read_string(np, "atmel,watchdog-type", &tmp) && if (!of_property_read_string(np, "atmel,watchdog-type", &tmp) &&
!strcmp(tmp, "software")) !strcmp(tmp, "software"))
wdt->config |= AT91_WDT_WDFIEN; wdt->mr |= AT91_WDT_WDFIEN;
else else
wdt->config |= AT91_WDT_WDRSTEN; wdt->mr |= AT91_WDT_WDRSTEN;
if (of_property_read_bool(np, "atmel,idle-halt")) if (of_property_read_bool(np, "atmel,idle-halt"))
wdt->config |= AT91_WDT_WDIDLEHLT; wdt->mr |= AT91_WDT_WDIDLEHLT;
if (of_property_read_bool(np, "atmel,dbg-halt")) if (of_property_read_bool(np, "atmel,dbg-halt"))
wdt->config |= AT91_WDT_WDDBGHLT; wdt->mr |= AT91_WDT_WDDBGHLT;
return 0; return 0;
} }
@ -163,11 +157,10 @@ static int sama5d4_wdt_init(struct sama5d4_wdt *wdt)
reg &= ~AT91_WDT_WDDIS; reg &= ~AT91_WDT_WDDIS;
wdt_write(wdt, AT91_WDT_MR, reg); wdt_write(wdt, AT91_WDT_MR, reg);
reg = wdt->config; wdt->mr |= AT91_WDT_SET_WDD(value);
reg |= AT91_WDT_SET_WDD(value); wdt->mr |= AT91_WDT_SET_WDV(value);
reg |= AT91_WDT_SET_WDV(value);
wdt_write(wdt, AT91_WDT_MR, reg); wdt_write(wdt, AT91_WDT_MR, wdt->mr);
return 0; return 0;
} }
@ -211,7 +204,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
return ret; return ret;
} }
if ((wdt->config & AT91_WDT_WDFIEN) && irq) { if ((wdt->mr & AT91_WDT_WDFIEN) && irq) {
ret = devm_request_irq(&pdev->dev, irq, sama5d4_wdt_irq_handler, ret = devm_request_irq(&pdev->dev, irq, sama5d4_wdt_irq_handler,
IRQF_SHARED | IRQF_IRQPOLL | IRQF_SHARED | IRQF_IRQPOLL |
IRQF_NO_SUSPEND, pdev->name, pdev); IRQF_NO_SUSPEND, pdev->name, pdev);