intel: Fix watchdog driver structure

Signed-off-by: Hadi Asyrafi <muhammad.hadi.asyrafi.abdul.halim@intel.com>
Change-Id: I0ffccca7ea83bff35c9f149d7054cd610a59ec01

diff --git a/plat/intel/soc/common/drivers/wdt/watchdog.c b/plat/intel/soc/common/drivers/wdt/watchdog.c
index b4dbe5f4b0f81214c963ffa8da5c9052427cb821..0f89b4fd3b1e3f3cc546a7b73730759d04f2b910 100644 (file)
--- 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 9410242a09e1c07363e0002276743ffaa01a1209..2c724631d26768a3e0c1de95ae071b06e54ab924 100644 (file)
--- 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);