dm: treewide: Rename auto_alloc_size members to be shorter

[platform/kernel/u-boot.git] / drivers / watchdog / cdns_wdt.c

diff --git a/drivers/watchdog/cdns_wdt.c b/drivers/watchdog/cdns_wdt.c
index fc85fbc..d4f8240 100644 (file)
--- a/drivers/watchdog/cdns_wdt.c
+++ b/drivers/watchdog/cdns_wdt.c
@@ -8,12 +8,14 @@
 
 #include <common.h>
 #include <dm.h>
+#include <log.h>
 #include <wdt.h>
 #include <clk.h>
+#include <div64.h>
+#include <dm/device_compat.h>
+#include <linux/err.h>
 #include <linux/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct cdns_regs {
        u32 zmr;        /* WD Zero mode register, offset - 0x0 */
        u32 ccr;        /* Counter Control Register offset - 0x4 */
@@ -23,7 +25,6 @@ struct cdns_regs {
 
 struct cdns_wdt_priv {
        bool rst;
-       u32 timeout;
        struct cdns_regs *regs;
 };
 
@@ -142,10 +143,10 @@ static int cdns_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
                return -1;
        }
 
-       if ((timeout < CDNS_WDT_MIN_TIMEOUT) ||
-           (timeout > CDNS_WDT_MAX_TIMEOUT)) {
-               timeout = priv->timeout;
-       }
+       /* Calculate timeout in seconds and restrict to min and max value */
+       do_div(timeout, 1000);
+       timeout = max_t(u64, timeout, CDNS_WDT_MIN_TIMEOUT);
+       timeout = min_t(u64, timeout, CDNS_WDT_MAX_TIMEOUT);
 
        debug("%s: CLK_FREQ %ld, timeout %lld\n", __func__, clk_f, timeout);
 
@@ -235,12 +236,9 @@ static int cdns_wdt_ofdata_to_platdata(struct udevice *dev)
        if (IS_ERR(priv->regs))
                return PTR_ERR(priv->regs);
 
-       priv->timeout = dev_read_u32_default(dev, "timeout-sec",
-                                            CDNS_WDT_DEFAULT_TIMEOUT);
-
        priv->rst = dev_read_bool(dev, "reset-on-timeout");
 
-       debug("%s: timeout %d, reset %d\n", __func__, priv->timeout, priv->rst);
+       debug("%s: reset %d\n", __func__, priv->rst);
 
        return 0;
 }
@@ -262,7 +260,7 @@ U_BOOT_DRIVER(cdns_wdt) = {
        .id = UCLASS_WDT,
        .of_match = cdns_wdt_ids,
        .probe = cdns_wdt_probe,
-       .priv_auto_alloc_size = sizeof(struct cdns_wdt_priv),
+       .priv_auto      = sizeof(struct cdns_wdt_priv),
        .ofdata_to_platdata = cdns_wdt_ofdata_to_platdata,
        .ops = &cdns_wdt_ops,
 };