Merge git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / cmd / clk.c

diff --git a/cmd/clk.c b/cmd/clk.c
index fd4231589c5cb4d70cc69a9d613a26d504777d8d..439736d0724e6fc31c47d2f78e0fc898759cef9b 100644 (file)
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -7,49 +7,72 @@
 #include <clk.h>
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
 #include <dm.h>
+#include <dm/device.h>
+#include <dm/root.h>
 #include <dm/device-internal.h>
+#include <linux/clk-provider.h>
 #endif
 
-int __weak soc_clk_dump(void)
-{
 #if defined(CONFIG_DM) && defined(CONFIG_CLK)
-       struct udevice *dev;
-       struct uclass *uc;
-       struct clk clk;
-       int ret;
-
-       /* Device addresses start at 1 */
-       ret = uclass_get(UCLASS_CLK, &uc);
-       if (ret)
-               return ret;
-
-       uclass_foreach_dev(dev, uc) {
-               memset(&clk, 0, sizeof(clk));
-               ret = device_probe(dev);
-               if (ret) {
-                       printf("%-30.30s : ? Hz\n", dev->name);
-                       continue;
+static void show_clks(struct udevice *dev, int depth, int last_flag)
+{
+       int i, is_last;
+       struct udevice *child;
+       struct clk *clkp;
+       u32 rate;
+
+       clkp = dev_get_clk_ptr(dev);
+       if (device_get_uclass_id(dev) == UCLASS_CLK && clkp) {
+               rate = clk_get_rate(clkp);
+
+       printf(" %-12u  %8d        ", rate, clkp->enable_count);
+
+       for (i = depth; i >= 0; i--) {
+               is_last = (last_flag >> i) & 1;
+               if (i) {
+                       if (is_last)
+                               printf("    ");
+                       else
+                               printf("|   ");
+               } else {
+                       if (is_last)
+                               printf("`-- ");
+                       else
+                               printf("|-- ");
                }
+       }
 
-               ret = clk_request(dev, &clk);
-               if (ret) {
-                       printf("%-30.30s : ? Hz\n", dev->name);
-                       continue;
-               }
+       printf("%s\n", dev->name);
+       }
+
+       list_for_each_entry(child, &dev->child_head, sibling_node) {
+               is_last = list_is_last(&child->sibling_node, &dev->child_head);
+               show_clks(child, depth + 1, (last_flag << 1) | is_last);
+       }
+}
 
-               printf("%-30.30s : %lu Hz\n", dev->name, clk_get_rate(&clk));
+int __weak soc_clk_dump(void)
+{
+       struct udevice *root;
 
-               clk_free(&clk);
+       root = dm_root();
+       if (root) {
+               printf(" Rate               Usecnt      Name\n");
+               printf("------------------------------------------\n");
+               show_clks(root, -1, 0);
        }
 
        return 0;
+}
 #else
+int __weak soc_clk_dump(void)
+{
        puts("Not implemented\n");
        return 1;
-#endif
 }
+#endif
 
-static int do_clk_dump(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_clk_dump(struct cmd_tbl *cmdtp, int flag, int argc,
                       char *const argv[])
 {
        int ret;
@@ -63,14 +86,14 @@ static int do_clk_dump(cmd_tbl_t *cmdtp, int flag, int argc,
        return ret;
 }
 
-static cmd_tbl_t cmd_clk_sub[] = {
+static struct cmd_tbl cmd_clk_sub[] = {
        U_BOOT_CMD_MKENT(dump, 1, 1, do_clk_dump, "", ""),
 };
 
-static int do_clk(cmd_tbl_t *cmdtp, int flag, int argc,
+static int do_clk(struct cmd_tbl *cmdtp, int flag, int argc,
                  char *const argv[])
 {
-       cmd_tbl_t *c;
+       struct cmd_tbl *c;
 
        if (argc < 2)
                return CMD_RET_USAGE;