From: Ian Abbott <abbotti@mev.co.uk>
To: barebox@lists.infradead.org
Cc: Ian Abbott <abbotti@mev.co.uk>
Subject: [PATCH] ARM: socfpga: Cyclone5: remove watchdog_disable()
Date: Wed, 10 Apr 2019 10:37:37 +0100 [thread overview]
Message-ID: <20190410093737.8862-1-abbotti@mev.co.uk> (raw)
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
next reply other threads:[~2019-04-10 9:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-10 9:37 Ian Abbott [this message]
2019-04-23 8:34 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190410093737.8862-1-abbotti@mev.co.uk \
--to=abbotti@mev.co.uk \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox