From: Roland Stigge <stigge@antcom.de>
Date: Tue, 9 Sep 2014 13:13:14 +0000 (+0200)
Subject: ARM: LPC32xx: Fix reset function
X-Git-Tag: fixes-for-v3.18-merge-window~7^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01100c022df5d9b8ac56d3705e33e69dc012a6e2;p=pandora-kernel.git

ARM: LPC32xx: Fix reset function

In the recent change to the reset function API (commit
7b6d864b48d95e6ea1df7df64475b9cb9616dcf9), the mode argument changed from a
char to an enum. lpc23xx_restart() only handles REBOOT_SOFT and REBOOT_HARD,
but the new kernel code emits REBOOT_COLD (0) on reboots now which leads to
lpc32xx simply not rebooting (but halting).

This patch fixes this by just resetting unconditionally as on other platforms
(e.g. mach-bcm2835).

Pulling lpc32xx_watchdog_reset() into lpc23xx_restart() since the while() in
lpc23xx_restart() is part of the procedure anyway and lpc32xx_watchdog_reset()
isn't used anywhere else anymore.

Signed-off-by: Roland Stigge <stigge@antcom.de>
---

Reading git-diff-tree failed