dtoc: Tidy up more Python style in dtb_platdata

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

diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c
index f8ddf93cf8157fcf2a2de60fcab046914829d66e..62d0e860e80c527aa9d982fe3cb44be1c4bf7cef 100644 (file)
--- a/drivers/timer/timer-uclass.c
+++ b/drivers/timer/timer-uclass.c
@@ -1,15 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Thomas Chou <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <clk.h>
+#include <cpu.h>
 #include <dm.h>
 #include <dm/lists.h>
+#include <dm/device_compat.h>
 #include <dm/device-internal.h>
+#include <dm/root.h>
 #include <errno.h>
+#include <init.h>
 #include <timer.h>
+#include <linux/err.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -29,7 +34,8 @@ int notrace timer_get_count(struct udevice *dev, u64 *count)
        if (!ops->get_count)
                return -ENOSYS;
 
-       return ops->get_count(dev, count);
+       *count = ops->get_count(dev);
+       return 0;
 }
 
 unsigned long notrace timer_get_rate(struct udevice *dev)
@@ -41,10 +47,27 @@ unsigned long notrace timer_get_rate(struct udevice *dev)
 
 static int timer_pre_probe(struct udevice *dev)
 {
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
        struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct clk timer_clk;
+       int err;
+       ulong ret;
+
+       /* It is possible that a timer device has a null ofnode */
+       if (!dev_of_valid(dev))
+               return 0;
 
-       uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-                                            "clock-frequency", 0);
+       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 =
+                       dev_read_u32_default(dev, "clock-frequency", 0);
+       }
+#endif
 
        return 0;
 }
@@ -59,6 +82,36 @@ static int timer_post_probe(struct udevice *dev)
        return 0;
 }
 
+/*
+ * TODO: should be CONFIG_IS_ENABLED(CPU), but the SPL config has _SUPPORT on
+ * the end...
+ */
+#if defined(CONFIG_CPU) || defined(CONFIG_SPL_CPU_SUPPORT)
+int timer_timebase_fallback(struct udevice *dev)
+{
+       struct udevice *cpu;
+       struct cpu_platdata *cpu_plat;
+       struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+
+       /* Did we get our clock rate from the device tree? */
+       if (uc_priv->clock_rate)
+               return 0;
+
+       /* Fall back to timebase-frequency */
+       dev_dbg(dev, "missing clocks or clock-frequency property; falling back on timebase-frequency\n");
+       cpu = cpu_get_current_dev();
+       if (!cpu)
+               return -ENODEV;
+
+       cpu_plat = dev_get_parent_platdata(cpu);
+       if (!cpu_plat)
+               return -ENODEV;
+
+       uc_priv->clock_rate = cpu_plat->timebase_freq;
+       return 0;
+}
+#endif
+
 u64 timer_conv_64(u32 count)
 {
        /* increment tbh if tbl has rolled over */
@@ -70,34 +123,43 @@ u64 timer_conv_64(u32 count)
 
 int notrace dm_timer_init(void)
 {
-       const void *blob = gd->fdt_blob;
        struct udevice *dev = NULL;
-       int node;
+       __maybe_unused ofnode node;
        int ret;
 
        if (gd->timer)
                return 0;
 
+       /*
+        * Directly access gd->dm_root to suppress error messages, if the
+        * virtual root driver does not yet exist.
+        */
+       if (gd->dm_root == NULL)
+               return -EAGAIN;
+
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
        /* 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 */
+       node = ofnode_get_chosen_node("tick-timer");
+
+       if (ofnode_valid(node) &&
+           uclass_get_device_by_ofnode(UCLASS_TIMER, node, &dev)) {
+               /*
+                * If the timer is not marked to be bound before
+                * relocation, bind it anyway.
+                */
+               if (!lists_bind_fdt(dm_root(), node, &dev, false)) {
+                       ret = device_probe(dev);
+                       if (ret)
+                               return ret;
+               }
+       }
+#endif
+
+       if (!dev) {
+               /* Fall back to the 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) {