diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:50 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:50 +0200 |
| commit | bac01839b063697200d5b957b652da197b8f0b1d (patch) | |
| tree | 8b2441ee12fd42abf152d990eda478aaf722e4e9 /arch | |
| parent | 65cfdbebb19f0b1c8d322a3eb9ec464d669a4d3f (diff) | |
| parent | a306c1c0bd09e7ee074d113b8a86bd815ef64017 (diff) | |
| download | barebox-bac01839b063697200d5b957b652da197b8f0b1d.tar.gz barebox-bac01839b063697200d5b957b652da197b8f0b1d.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-socfpga/cyclone5-reset-manager.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/arm/mach-socfpga/cyclone5-reset-manager.c b/arch/arm/mach-socfpga/cyclone5-reset-manager.c index 4bbe1a8101..8635806846 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) { |