timer: Support clocks via phandle

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

diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index 82c68975bed04b8271a300c4cbd1ff4f123018a0..5c63e6b41014ea92a43535a617d988492796420f 100644 (file)
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -6,19 +6,24 @@
 
 #include <common.h>
 #include <dm.h>
+#include <dm/lists.h>
+#include <dm/device-internal.h>
+#include <clk.h>
 #include <errno.h>
 #include <timer.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /*
  * Implement a timer uclass to work with lib/time.c. The timer is usually
- * a 32 bits free-running up counter. The get_rate() method is used to get
+ * a 32/64 bits free-running up counter. The get_rate() method is used to get
  * the input clock frequency of the timer. The get_count() method is used
- * to get the current 32 bits count value. If the hardware is counting down,
+ * to get the current 64 bits count value. If the hardware is counting down,
  * the value should be inversed inside the method. There may be no real
  * tick, and no timer interrupt.
  */
 
-int timer_get_count(struct udevice *dev, unsigned long *count)
+int notrace timer_get_count(struct udevice *dev, u64 *count)
 {
        const struct timer_ops *ops = device_get_ops(dev);
 
@@ -28,15 +33,97 @@ int timer_get_count(struct udevice *dev, unsigned long *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;
 }
 
+static int timer_pre_probe(struct udevice *dev)
+{
+       struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       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, "clock-frequency", 0);
+
+       return 0;
+}
+
+static int timer_post_probe(struct udevice *dev)
+{
+       struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+
+       if (!uc_priv->clock_rate)
+               return -EINVAL;
+
+       return 0;
+}
+
+u64 timer_conv_64(u32 count)
+{
+       /* increment tbh if tbl has rolled over */
+       if (count < gd->timebase_l)
+               gd->timebase_h++;
+       gd->timebase_l = count;
+       return ((u64)gd->timebase_h << 32) | gd->timebase_l;
+}
+
+int notrace dm_timer_init(void)
+{
+       const void *blob = gd->fdt_blob;
+       struct udevice *dev = NULL;
+       int node;
+       int ret;
+
+       if (gd->timer)
+               return 0;
+
+       /* Check for a chosen timer to be used for tick */
+       node = fdtdec_get_chosen_node(blob, "tick-timer");
+       if (node < 0) {
+               /* No chosen timer, trying first available timer */
+               ret = uclass_first_device_err(UCLASS_TIMER, &dev);
+               if (ret)
+                       return ret;
+       } else {
+               if (uclass_get_device_by_of_offset(UCLASS_TIMER, node, &dev)) {
+                       /*
+                        * If the timer is not marked to be bound before
+                        * relocation, bind it anyway.
+                        */
+                       if (node > 0 &&
+                           !lists_bind_fdt(gd->dm_root, blob, node, &dev)) {
+                               ret = device_probe(dev);
+                               if (ret)
+                                       return ret;
+                       }
+               }
+       }
+
+       if (dev) {
+               gd->timer = dev;
+               return 0;
+       }
+
+       return -ENODEV;
+}
+
 UCLASS_DRIVER(timer) = {
        .id             = UCLASS_TIMER,
        .name           = "timer",
+       .pre_probe      = timer_pre_probe,
+       .flags          = DM_UC_FLAG_SEQ_ALIAS,
+       .post_probe     = timer_post_probe,
        .per_device_auto_alloc_size = sizeof(struct timer_dev_priv),
 };