Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/drivers/timer/ag101p_timer.c b/drivers/timer/ag101p_timer.c
index 163402f8ce6c9951501effa1a115c1f33b1f3e96..6e20b4fc337bacbd58d46ce665c19490ff1f0cef 100644 (file)
--- a/drivers/timer/ag101p_timer.c
+++ b/drivers/timer/ag101p_timer.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Andestech ATFTMR010 timer driver
  *
  * (C) Copyright 2016
  * Rick Chen, NDS32 Software Engineering, rick@andestech.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <dm.h>
@@ -12,8 +11,6 @@
 #include <timer.h>
 #include <linux/io.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /*
  * Timer Control Register
  */
@@ -95,7 +92,7 @@ static int atftmr_timer_probe(struct udevice *dev)
 static int atftme_timer_ofdata_to_platdata(struct udevice *dev)
 {
        struct atftmr_timer_platdata *plat = dev_get_platdata(dev);
-       plat->regs = map_physmem(dev_get_addr(dev),
+       plat->regs = map_physmem(devfdt_get_addr(dev),
                                 sizeof(struct atftmr_timer_regs),
                                 MAP_NOCACHE);
        return 0;
@@ -118,5 +115,4 @@ U_BOOT_DRIVER(altera_timer) = {
        .platdata_auto_alloc_size = sizeof(struct atftmr_timer_platdata),
        .probe = atftmr_timer_probe,
        .ops    = &ag101p_timer_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };