Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9f98ce7 authored by Lingling Xu's avatar Lingling Xu Committed by Greg Kroah-Hartman
Browse files

spi: sprd: switch the sequence of setting WDG_LOAD_LOW and _HIGH 



commit 8bdd79dae1ff5397351b95e249abcae126572617 upstream.

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: ac177501 ("spi: sprd: Add the support of restarting the system")
Signed-off-by: default avatarLingling Xu <ling_ling.xu@unisoc.com>
Signed-off-by: default avatarChunyan Zhang <chunyan.zhang@unisoc.com>
Link: https://lore.kernel.org/r/20200602082415.5848-1-zhang.lyra@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3fa6917

drivers/spi/spi-sprd-adi.c

+1 −1
Original line number Diff line number Diff line
@@ -358,9 +358,9 @@ static int sprd_adi_restart_handler(struct notifier_block *this, 
	sprd_adi_write(sadi, sadi->slave_pbase + REG_WDG_LOCK, WDG_UNLOCK_KEY);



	/* 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);