Nokia RX-51: Enable CONFIG_WDT to remove deprecation warning

Also convert CONFIG_HW_WATCHDOG to CONFIG_WATCHDOG.

Signed-off-by: Pali Roh?r <pali@kernel.org>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Link: https://lore.kernel.org/r/20210309201915.16586-1-pali@kernel.org

diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 7bd5fbd715207628e7f39e6bc83c36aa657e14fd..fd3cec8358aaf9ec798b749bc5de25722784f333 100644 (file)
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -26,6 +26,7 @@
 #include <env.h>
 #include <init.h>
 #include <watchdog.h>
+#include <wdt.h>
 #include <malloc.h>
 #include <twl4030.h>
 #include <i2c.h>
@@ -487,20 +488,20 @@ static unsigned long int twl_wd_time; /* last time of watchdog reset */
 static unsigned long int twl_i2c_lock;
 
 /*
- * Routine: hw_watchdog_reset
+ * Routine: rx51_watchdog_reset
  * Description: Reset timeout of twl4030 watchdog.
  */
-void hw_watchdog_reset(void)
+static int rx51_watchdog_reset(struct udevice *dev)
 {
        u8 timeout = 0;
 
        /* do not reset watchdog too often - max every 4s */
        if (get_timer(twl_wd_time) < 4 * CONFIG_SYS_HZ)
-               return;
+               return 0;
 
        /* localy lock twl4030 i2c bus */
        if (test_and_set_bit(0, &twl_i2c_lock))
-               return;
+               return 0;
 
        /* read actual watchdog timeout */
        twl4030_i2c_read_u8(TWL4030_CHIP_PM_RECEIVER,
@@ -517,8 +518,32 @@ void hw_watchdog_reset(void)
 
        /* localy unlock twl4030 i2c bus */
        test_and_clear_bit(0, &twl_i2c_lock);
+
+       return 0;
+}
+
+static int rx51_watchdog_start(struct udevice *dev, u64 timeout_ms, ulong flags)
+{
+       return 0;
 }
 
+static int rx51_watchdog_probe(struct udevice *dev)
+{
+       return 0;
+}
+
+static const struct wdt_ops rx51_watchdog_ops = {
+       .start = rx51_watchdog_start,
+       .reset = rx51_watchdog_reset,
+};
+
+U_BOOT_DRIVER(rx51_watchdog) = {
+       .name = "rx51_watchdog",
+       .id = UCLASS_WDT,
+       .ops = &rx51_watchdog_ops,
+       .probe = rx51_watchdog_probe,
+};
+
 /*
  * TWL4030 keypad handler for cfb_console
  */
@@ -722,3 +747,7 @@ U_BOOT_DRVINFOS(rx51_i2c) = {
        { "i2c_omap", &rx51_i2c[1] },
        { "i2c_omap", &rx51_i2c[2] },
 };
+
+U_BOOT_DRVINFOS(rx51_watchdog) = {
+       { "rx51_watchdog" },
+};

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 3548aab0e16ed3c3859c7a1560bd6a093010b2b7..061f5c357c467c27db76b97f24b81eb835e9f523 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -67,4 +67,6 @@ CONFIG_CFB_CONSOLE=y
 CONFIG_CFB_CONSOLE_ANSI=y
 # CONFIG_VGA_AS_SINGLE_DEVICE is not set
 CONFIG_SPLASH_SCREEN=y
+CONFIG_WATCHDOG_TIMEOUT_MSECS=31000
+CONFIG_WDT=y
 # CONFIG_GZIP is not set

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 23368de624e13e9dd3a2dc0217d2266e2912f1fe..fe991ea039912b5d68b6bc6c8676359b49a7e11d 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -85,9 +85,6 @@
 
 #define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
 
-/* Watchdog support */
-#define CONFIG_HW_WATCHDOG
-
 /*
  * Framebuffer
  */