From 19e3644528598c37e82b3bedbca60f5eea2eee3d Mon Sep 17 00:00:00 2001
From: Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com>
Date: Mon, 17 Jun 2019 12:02:18 +0800
Subject: [PATCH] intel: Fix watchdog driver structure
Signed-off-by: Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com>
Change-Id: I0ffccca7ea83bff35c9f149d7054cd610a59ec01
---
plat/intel/soc/common/drivers/wdt/watchdog.c | 9 ++-------
plat/intel/soc/common/drivers/wdt/watchdog.h | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/plat/intel/soc/common/drivers/wdt/watchdog.c b/plat/intel/soc/common/drivers/wdt/watchdog.c
index b4dbe5f4b..0f89b4fd3 100644
--- a/plat/intel/soc/common/drivers/wdt/watchdog.c
+++ b/plat/intel/soc/common/drivers/wdt/watchdog.c
@@ -28,10 +28,10 @@ void watchdog_info(void)
void watchdog_status(void)
{
if (mmio_read_32(WDT_CR) & 1) {
- INFO("Watchdog Timer in currently enabled\n");
+ INFO("Watchdog Timer is currently enabled\n");
INFO("Current Counter : 0x%x\r\n", mmio_read_32(WDT_CCVR));
} else {
- INFO("Watchdog Timer in currently disabled\n");
+ INFO("Watchdog Timer is currently disabled\n");
}
}
@@ -49,10 +49,5 @@ void watchdog_init(int watchdog_clk)
mmio_write_32(WDT_TORR, (cycles_i << 4) | cycles_i);
- watchdog_enable();
-}
-
-void watchdog_enable(void)
-{
mmio_write_32(WDT_CR, WDT_CR_RMOD|WDT_CR_EN);
}
diff --git a/plat/intel/soc/common/drivers/wdt/watchdog.h b/plat/intel/soc/common/drivers/wdt/watchdog.h
index 9410242a0..2c724631d 100644
--- a/plat/intel/soc/common/drivers/wdt/watchdog.h
+++ b/plat/intel/soc/common/drivers/wdt/watchdog.h
@@ -32,7 +32,6 @@
void watchdog_init(int watchdog_clk);
-void watchdog_enable(void);
void watchdog_info(void);
void watchdog_status(void);
void watchdog_sw_rst(void);
--
GitLab