Nokia RX-51: Enable CONFIG_WDT to remove deprecation warning
PATCH 1/1 Nokia RX-51: Enable CONFIG_WDT to remove deprecation warning
---
This patch increase u-boot.bin binary size above maximal limit. So this patch cannot be applied yet. But it can be applied on top of the LTO patches. So please put this patch into the queue and include it into U-Boot after LTO patches are merged.
--- configs/nokia_rx51_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/nokia_rx51_defconfig +2 -0
@@ -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 is not set +CONFIG_WDT=y # CONFIG_GZIP is not set
Signature · 1 line
2.20.1
PATCH 1/1 Nokia RX-51: Enable CONFIG_WDT to remove deprecation warning
Quoted 15 lines · Pali Roh?r
Signed-off-by Pali Roh?r <[email protected]>---
This patch increase u-boot.bin binary size above maximal limit. So this patch cannot be applied yet. But it can be applied on top of the LTO patches. So please put this patch into the queue and include it into U-Boot after LTO patches are merged.--- configs/nokia_rx51_defconfig | 2 ++ 1 file changed, 2 insertions(+)configs/nokia_rx51_defconfig +0
-0
configs/nokia_rx51_defconfig CONFIG_CFB_CONSOLE=y · line 72
Quoted 6 lines
configs/nokia_rx51_defconfig +2
-0@@ -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 is not set +CONFIG_WDT=y # CONFIG_GZIP is not set
Please update include/configs/nokia_rx51.h to not set CONFIG_HW_WATCHDOG and then make sure the appropriate watchdog options are enabled.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210307/16f9593c/attachment.sig>
PATCH v2 1/1 Nokia RX-51: Enable CONFIG_WDT to remove deprecation warning
In reply to Pali RohárAlso convert CONFIG_HW_WATCHDOG to CONFIG_WATCHDOG.
---
This patch increase u-boot.bin binary size above maximal limit. So this patch cannot be applied yet. But it can be applied on top of the LTO patches. So please put this patch into the queue and include it into U-Boot after LTO patches are merged.
Changes in v2:
* converted CONFIG_HW_WATCHDOG to CONFIG_WATCHDOG
--- board/nokia/rx51/rx51.c | 37 ++++++++++++++++++++++++++++++++---- configs/nokia_rx51_defconfig | 2 ++ include/configs/nokia_rx51.h | 3 --- 3 files changed, 35 insertions(+), 7 deletions(-)
board/nokia/rx51/rx51.c +33 -4
@@ -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" }, +};
configs/nokia_rx51_defconfig +2 -0
@@ -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
include/configs/nokia_rx51.h +0 -3
@@ -85,9 +85,6 @@#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -/* Watchdog support */ -#define CONFIG_HW_WATCHDOG -/* * Framebuffer */
Signature · 1 line
2.20.1
Quoted 8 lines · Pali Rohár
Also convert
CONFIG_HW_WATCHDOGtoCONFIG_WATCHDOG.Signed-off-by Pali Rohár <[email protected]>---
This patch increase u-boot.bin binary size above maximal limit. So this patch cannot be applied yet. But it can be applied on top of the LTO patches. So please put this patch into the queue and include it into U-Boot after LTO patches are merged.
Hi,
Can you ping me once the LTO patches are merged?
Thanks and regards,
Lokesh
Quoted 10 lines · On Monday 07 June 2021 14:57:55 Lokesh Vutla wrote:
Quoted 8 lines · Pali Rohár
Also convert
CONFIG_HW_WATCHDOGtoCONFIG_WATCHDOG.Signed-off-by Pali Rohár <[email protected]>---
This patch increase u-boot.bin binary size above maximal limit. So this patch cannot be applied yet. But it can be applied on top of the LTO patches. So please put this patch into the queue and include it into U-Boot after LTO patches are merged.
Quoted 2 lines
Hi,
Can you ping me once the LTO patches are merged?
ping (they are already merged)
Quoted 3 lines
Thanks and regards,
Lokesh
Quoted 1 line · Pali Rohár
Also convert
CONFIG_HW_WATCHDOGtoCONFIG_WATCHDOG.
Applied to https://source.denx.de/u-boot/custodians/u-boot-ti.git master, thanks! [1/1] Nokia RX-51: Enable CONFIG_WDT to remove deprecation warning
https://source.denx.de/u-boot/custodians/u-boot-ti/-/commit/e61a4ff13f
--
Thanks and Regards,
Lokesh