Merge tag 'efi-2020-07-rc4' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

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

diff --git a/drivers/timer/arc_timer.c b/drivers/timer/arc_timer.c
index e94e4a4bca7e606d6cac8e646ebe17dbfe428e21..8c574ec5af1d8a46e02b50978b2f43f1f54b4b8b 100644 (file)
--- a/drivers/timer/arc_timer.c
+++ b/drivers/timer/arc_timer.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Synopsys, Inc. All rights reserved.
- *
- * SPDX-License-Identifier: GPL-2.0+
  */
 
 #include <common.h>
@@ -51,7 +50,7 @@ static int arc_timer_probe(struct udevice *dev)
        struct arc_timer_priv *priv = dev_get_priv(dev);
 
        /* Get registers offset and size */
-       id = fdtdec_get_int(gd->fdt_blob, dev->of_offset, "reg", -1);
+       id = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", -1);
        if (id < 0)
                return -EINVAL;
 
@@ -108,6 +107,5 @@ U_BOOT_DRIVER(arc_timer) = {
        .of_match = arc_timer_ids,
        .probe = arc_timer_probe,
        .ops    = &arc_timer_ops,
-       .flags = DM_FLAG_PRE_RELOC,
        .priv_auto_alloc_size = sizeof(struct arc_timer_priv),
 };