Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / cmd / clk.c

diff --git a/cmd/clk.c b/cmd/clk.c
index 74ad868..e3c3d2f 100644 (file)
--- a/cmd/clk.c
+++ b/cmd/clk.c
@@ -23,31 +23,32 @@ static void show_clks(struct udevice *dev, int depth, int last_flag)
 
        clkp = dev_get_clk_ptr(dev);
        if (device_get_uclass_id(dev) == UCLASS_CLK && clkp) {
+               depth++;
                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("|-- ");
+               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("|-- ");
+                       }
                }
-       }
 
-       printf("%s\n", dev->name);
+               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);
+               show_clks(child, depth, (last_flag << 1) | is_last);
        }
 }
 
@@ -72,7 +73,7 @@ int __weak soc_clk_dump(void)
 }
 #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;
@@ -86,14 +87,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;