Hi Guenter,
> Use device_property_read_u32() instead of of_property_read_u32() to support
> reading the timeout from non-devicetree sources.
>
> Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/watchdog_core.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
> index d46d8c8c01f2..6152dba4b52c 100644
> --- a/drivers/watchdog/watchdog_core.c
> +++ b/drivers/watchdog/watchdog_core.c
> @@ -33,7 +33,8 @@
> #include <linux/init.h> /* For __init/__exit/... */
> #include <linux/idr.h> /* For ida_* macros */
> #include <linux/err.h> /* For IS_ERR macros */
> -#include <linux/of.h> /* For of_get_timeout_sec */
> +#include <linux/of.h> /* For of_alias_get_id */
> +#include <linux/property.h> /* For device_property_read_u32 */
> #include <linux/suspend.h>
>
> #include "watchdog_core.h" /* For watchdog_dev_register/... */
> @@ -137,8 +138,7 @@ int watchdog_init_timeout(struct watchdog_device *wdd,
> }
>
> /* try to get the timeout_sec property */
> - if (dev && dev->of_node &&
> - of_property_read_u32(dev->of_node, "timeout-sec", &t) == 0) {
> + if (dev && device_property_read_u32(dev, "timeout-sec", &t) == 0) {
> if (t && !watchdog_timeout_invalid(wdd, t)) {
> wdd->timeout = t;
> return 0;
> --
> 2.45.2
>
Added to linux-watchdog-next.
Kind regards,
Wim.
