Merge branch 'master' of git://git.denx.de/u-boot-tegra

[u-boot] / drivers / watchdog / ast_wdt.c

diff --git a/drivers/watchdog/ast_wdt.c b/drivers/watchdog/ast_wdt.c
index b2bd912ad53c18cc9058d73324e299636d0c146d..477605e7222dfb1e1a094019d5a685149ba39e71 100644 (file)
--- a/drivers/watchdog/ast_wdt.c
+++ b/drivers/watchdog/ast_wdt.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2017 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -14,8 +13,6 @@
 #define WDT_AST2500    2500
 #define WDT_AST2400    2400
 
-DECLARE_GLOBAL_DATA_PTR;
-
 struct ast_wdt_priv {
        struct ast_wdt *regs;
 };
@@ -84,7 +81,7 @@ static int ast_wdt_ofdata_to_platdata(struct udevice *dev)
 {
        struct ast_wdt_priv *priv = dev_get_priv(dev);
 
-       priv->regs = dev_get_addr_ptr(dev);
+       priv->regs = devfdt_get_addr_ptr(dev);
        if (IS_ERR(priv->regs))
                return PTR_ERR(priv->regs);