regmap: use fdt address translation

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

diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 83d1a35e0622afc325fcc250a91d5aec52c20eb9..1caf3cd2887a4b8fcb639d90c0288c6ae3e731ce 100644 (file)
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <dm/lists.h>
 #include <dm/device-internal.h>
+#include <clk.h>
 #include <errno.h>
 #include <timer.h>
 
@@ -22,7 +23,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * tick, and no timer interrupt.
  */
 
-int timer_get_count(struct udevice *dev, u64 *count)
+int notrace timer_get_count(struct udevice *dev, u64 *count)
 {
        const struct timer_ops *ops = device_get_ops(dev);
 
@@ -32,9 +33,9 @@ int timer_get_count(struct udevice *dev, u64 *count)
        return ops->get_count(dev, count);
 }
 
-unsigned long timer_get_rate(struct udevice *dev)
+unsigned long notrace timer_get_rate(struct udevice *dev)
 {
-       struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct timer_dev_priv *uc_priv = dev->uclass_priv;
 
        return uc_priv->clock_rate;
 }
@@ -42,9 +43,19 @@ unsigned long timer_get_rate(struct udevice *dev)
 static int timer_pre_probe(struct udevice *dev)
 {
        struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-
-       uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-                                            "clock-frequency", 0);
+       struct clk timer_clk;
+       int err;
+       ulong ret;
+
+       err = clk_get_by_index(dev, 0, &timer_clk);
+       if (!err) {
+               ret = clk_get_rate(&timer_clk);
+               if (IS_ERR_VALUE(ret))
+                       return ret;
+               uc_priv->clock_rate = ret;
+       } else
+               uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob,
+                               dev_of_offset(dev),     "clock-frequency", 0);
 
        return 0;
 }
@@ -82,11 +93,9 @@ int notrace dm_timer_init(void)
        node = fdtdec_get_chosen_node(blob, "tick-timer");
        if (node < 0) {
                /* No chosen timer, trying first available timer */
-               ret = uclass_first_device(UCLASS_TIMER, &dev);
+               ret = uclass_first_device_err(UCLASS_TIMER, &dev);
                if (ret)
                        return ret;
-               if (!dev)
-                       return -ENODEV;
        } else {
                if (uclass_get_device_by_of_offset(UCLASS_TIMER, node, &dev)) {
                        /*