Merge tag 'mips-pull-2019-05-03' of git://git.denx.de/u-boot-mips

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

diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c
index 5b91c8a90b345aff94580c7b309bfc17fb6c450a..75263c5375e065dabd218c38620aec6910dd1b51 100644 (file)
--- a/drivers/timer/cadence-ttc.c
+++ b/drivers/timer/cadence-ttc.c
@@ -31,6 +31,28 @@ struct cadence_ttc_priv {
        struct cadence_ttc_regs *regs;
 };
 
+#if CONFIG_IS_ENABLED(BOOTSTAGE)
+ulong timer_get_boot_us(void)
+{
+       u64 ticks = 0;
+       u32 rate = 1;
+       u64 us;
+       int ret;
+
+       ret = dm_timer_init();
+       if (!ret) {
+               /* The timer is available */
+               rate = timer_get_rate(gd->timer);
+               timer_get_count(gd->timer, &ticks);
+       } else {
+               return 0;
+       }
+
+       us = (ticks * 1000) / rate;
+       return us;
+}
+#endif
+
 static int cadence_ttc_get_count(struct udevice *dev, u64 *count)
 {
        struct cadence_ttc_priv *priv = dev_get_priv(dev);
@@ -64,8 +86,10 @@ static int cadence_ttc_ofdata_to_platdata(struct udevice *dev)
 {
        struct cadence_ttc_priv *priv = dev_get_priv(dev);
 
-       priv->regs = map_physmem(devfdt_get_addr(dev),
+       priv->regs = map_physmem(dev_read_addr(dev),
                                 sizeof(struct cadence_ttc_regs), MAP_NOCACHE);
+       if (IS_ERR(priv->regs))
+               return PTR_ERR(priv->regs);
 
        return 0;
 }
@@ -87,5 +111,4 @@ U_BOOT_DRIVER(cadence_ttc) = {
        .priv_auto_alloc_size = sizeof(struct cadence_ttc_priv),
        .probe = cadence_ttc_probe,
        .ops = &cadence_ttc_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };