projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
263b81d
)
spi: sprd: switch the sequence of setting WDG_LOAD_LOW and _HIGH
author
Lingling Xu
<ling_ling.xu@unisoc.com>
Tue, 2 Jun 2020 08:24:15 +0000
(16:24 +0800)
committer
Mark Brown
<broonie@kernel.org>
Tue, 2 Jun 2020 10:45:11 +0000
(11:45 +0100)
The watchdog counter consists of WDG_LOAD_LOW and WDG_LOAD_HIGH,
which would be loaded to watchdog counter once writing WDG_LOAD_LOW.
Fixes:
ac1775012058
("spi: sprd: Add the support of restarting the system")
Signed-off-by: Lingling Xu <ling_ling.xu@unisoc.com>
Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
Link:
https://lore.kernel.org/r/20200602082415.5848-1-zhang.lyra@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-sprd-adi.c
patch
|
blob
|
history
diff --git
a/drivers/spi/spi-sprd-adi.c
b/drivers/spi/spi-sprd-adi.c
index
88e6543
..
bd23c46
100644
(file)
--- a/
drivers/spi/spi-sprd-adi.c
+++ b/
drivers/spi/spi-sprd-adi.c
@@
-389,9
+389,9
@@
static int sprd_adi_restart_handler(struct notifier_block *this,
sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_CTRL, val);
/* Load the watchdog timeout value, 50ms is always enough. */
+ sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_HIGH, 0);
sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_LOW,
WDG_LOAD_VAL & WDG_LOAD_MASK);
- sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOAD_HIGH, 0);
/* Start the watchdog to reset system */
sprd_adi_read(sadi, sadi->slave_pbase + REG_WDG_CTRL, &val);