Merge branch 'next'

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

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index ed8b219..ca2bc7c 100644 (file)
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -237,12 +237,12 @@ static int omap3_wdt_probe(struct udevice *dev)
 {
        struct omap3_wdt_priv *priv = dev_get_priv(dev);
 
-       priv->regs = (struct wd_timer *)devfdt_get_addr(dev);
+       priv->regs = dev_read_addr_ptr(dev);
        if (!priv->regs)
                return -EINVAL;
 
        priv->wdt_trgr_pattern = 0x1234;
-       debug("%s: Probing wdt%u\n", __func__, dev->seq);
+       debug("%s: Probing wdt%u\n", __func__, dev_seq(dev));
        return 0;
 }
 
@@ -263,6 +263,6 @@ U_BOOT_DRIVER(omap3_wdt) = {
        .of_match = omap3_wdt_ids,
        .ops = &omap3_wdt_ops,
        .probe = omap3_wdt_probe,
-       .priv_auto_alloc_size = sizeof(struct omap3_wdt_priv),
+       .priv_auto      = sizeof(struct omap3_wdt_priv),
 };
 #endif /* !CONFIG_IS_ENABLED(WDT) */