rockchip: rk3288: Move clock CMD to SoC file

Move the do_clock CMD to rk3288.c so that we can re-use
the common board file later.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/rk3288-board.c b/arch/arm/mach-rockchip/rk3288-board.c
index 915f82e8ba2a400c8dce900c4a74ce05e2aa9318..1c37038c992590a7e700547c238d91f593037a51 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288-board.c
+++ b/arch/arm/mach-rockchip/rk3288-board.c
@@ -127,54 +127,3 @@ int board_usb_cleanup(int index, enum usb_init_type init)
        return 0;
 }
 #endif
-
-static int do_clock(cmd_tbl_t *cmdtp, int flag, int argc,
-                      char * const argv[])
-{
-       static const struct {
-               char *name;
-               int id;
-       } clks[] = {
-               { "osc", CLK_OSC },
-               { "apll", CLK_ARM },
-               { "dpll", CLK_DDR },
-               { "cpll", CLK_CODEC },
-               { "gpll", CLK_GENERAL },
-#ifdef CONFIG_ROCKCHIP_RK3036
-               { "mpll", CLK_NEW },
-#else
-               { "npll", CLK_NEW },
-#endif
-       };
-       int ret, i;
-       struct udevice *dev;
-
-       ret = rockchip_get_clk(&dev);
-       if (ret) {
-               printf("clk-uclass not found\n");
-               return 0;
-       }
-
-       for (i = 0; i < ARRAY_SIZE(clks); i++) {
-               struct clk clk;
-               ulong rate;
-
-               clk.id = clks[i].id;
-               ret = clk_request(dev, &clk);
-               if (ret < 0)
-                       continue;
-
-               rate = clk_get_rate(&clk);
-               printf("%s: %lu\n", clks[i].name, rate);
-
-               clk_free(&clk);
-       }
-
-       return 0;
-}
-
-U_BOOT_CMD(
-       clock, 2, 1, do_clock,
-       "display information about clocks",
-       ""
-);

diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 4a1db99ac4b5ae7769ab9bd243d0467fca6aa442..10db6dfa9b62ab8794681aeec6cb87c7319dd7be 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -3,9 +3,13 @@
  * Copyright (c) 2016 Rockchip Electronics Co., Ltd
  */
 #include <common.h>
+#include <dm.h>
+#include <clk.h>
 #include <asm/armv7.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/cru_rk3288.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3288.h>
 #include <asm/arch-rockchip/pmu_rk3288.h>
@@ -95,3 +99,54 @@ void board_debug_uart_init(void)
                     GPIO7C6_UART2DBG_SIN << GPIO7C6_SHIFT);
 }
 #endif
+
+static int do_clock(cmd_tbl_t *cmdtp, int flag, int argc,
+                      char * const argv[])
+{
+       static const struct {
+               char *name;
+               int id;
+       } clks[] = {
+               { "osc", CLK_OSC },
+               { "apll", CLK_ARM },
+               { "dpll", CLK_DDR },
+               { "cpll", CLK_CODEC },
+               { "gpll", CLK_GENERAL },
+#ifdef CONFIG_ROCKCHIP_RK3036
+               { "mpll", CLK_NEW },
+#else
+               { "npll", CLK_NEW },
+#endif
+       };
+       int ret, i;
+       struct udevice *dev;
+
+       ret = rockchip_get_clk(&dev);
+       if (ret) {
+               printf("clk-uclass not found\n");
+               return 0;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(clks); i++) {
+               struct clk clk;
+               ulong rate;
+
+               clk.id = clks[i].id;
+               ret = clk_request(dev, &clk);
+               if (ret < 0)
+                       continue;
+
+               rate = clk_get_rate(&clk);
+               printf("%s: %lu\n", clks[i].name, rate);
+
+               clk_free(&clk);
+       }
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       clock, 2, 1, do_clock,
+       "display information about clocks",
+       ""
+);