Merge branch '2020-06-15-misc-bugfixes'

[oweals/u-boot.git] / drivers / timer / ast_timer.c

diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c
index d7c5460cd3c4813c91de96cc953e958e387a7d26..3838601f54d1c6b166f3e8e0b466160b79c0157e 100644 (file)
--- a/drivers/timer/ast_timer.c
+++ b/drivers/timer/ast_timer.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2016 Google Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -10,8 +9,7 @@
 #include <timer.h>
 #include <asm/io.h>
 #include <asm/arch/timer.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <linux/err.h>
 
 #define AST_TICK_TIMER  1
 #define AST_TMC_RELOAD_VAL  0xffffffff
@@ -66,7 +64,7 @@ static int ast_timer_ofdata_to_platdata(struct udevice *dev)
 {
        struct ast_timer_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);
 
@@ -93,5 +91,4 @@ U_BOOT_DRIVER(ast_timer) = {
        .priv_auto_alloc_size = sizeof(struct ast_timer_priv),
        .ofdata_to_platdata = ast_timer_ofdata_to_platdata,
        .ops = &ast_timer_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };