[PATCH] ARM: socfpga: Cyclone5: remove watchdog_disable()

[PATCH] ARM: socfpga: Cyclone5: remove watchdog_disable()

[Ian Abbott]

watchdog_disable() is left over from the original SoCFPGA commit and
nothing calls it.  Remove it to avoid a '-Wmissing-prototypes' warning
from the compiler.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 arch/arm/mach-socfpga/cyclone5-reset-manager.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/arch/arm/mach-socfpga/cyclone5-reset-manager.c b/arch/arm/mach-socfpga/cyclone5-reset-manager.c
index 4bbe1a810..863580684 100644
--- a/arch/arm/mach-socfpga/cyclone5-reset-manager.c
+++ b/arch/arm/mach-socfpga/cyclone5-reset-manager.c
@@ -22,23 +22,6 @@
 #include <mach/cyclone5-regs.h>
 #include <mach/cyclone5-reset-manager.h>
 
-/* Disable the watchdog (toggle reset to watchdog) */
-void watchdog_disable(void)
-{
-	void __iomem *rm = (void *)CYCLONE5_RSTMGR_ADDRESS;
-	uint32_t val;
-
-	/* assert reset for watchdog */
-	val = readl(rm + RESET_MGR_PER_MOD_RESET_OFS);
-	val |= 1 << RSTMGR_PERMODRST_L4WD0_LSB;
-	writel(val, rm + RESET_MGR_PER_MOD_RESET_OFS);
-
-	/* deassert watchdog from reset (watchdog in not running state) */
-	val = readl(rm + RESET_MGR_PER_MOD_RESET_OFS);
-	val &= ~(1 << RSTMGR_PERMODRST_L4WD0_LSB);
-	writel(val, rm + RESET_MGR_PER_MOD_RESET_OFS);
-}
-
 /* Write the reset manager register to cause reset */
 static void __noreturn socfpga_restart_soc(struct restart_handler *rst)
 {
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: socfpga: Cyclone5: remove watchdog_disable()

[Sascha Hauer]

On Wed, Apr 10, 2019 at 10:37:37AM +0100, Ian Abbott wrote:
> watchdog_disable() is left over from the original SoCFPGA commit and
> nothing calls it.  Remove it to avoid a '-Wmissing-prototypes' warning
> from the compiler.
> 
> Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
> ---
>  arch/arm/mach-socfpga/cyclone5-reset-manager.c | 17 -----------------
>  1 file changed, 17 deletions(-)

Applied, thanks

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox