rockchip: rk3399: Move rockchip_get_cru() out of the driver

This function is called from outside the driver. It should be placed into
common SoC code. Move it.

Also rename the driver symbol to be more consistent with the other rockchip
clock drivers.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
index 6776e484b737ff6a1f6242ffd73f3bf78c04a65e..98fba2bd7556a16f2d686d46f290902dfcf2be82 100644 (file)
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
@@ -9,6 +9,12 @@
 
 #include <common.h>
 
+/* Private data for the clock driver - used by rockchip_get_cru() */
+struct rk3399_clk_priv {
+       struct rk3399_cru *cru;
+       ulong rate;
+};
+
 struct rk3399_pmucru {
        u32 ppll_con[6];
        u32 reserved[0x1a];

diff --git a/arch/arm/mach-rockchip/rk3399/Makefile b/arch/arm/mach-rockchip/rk3399/Makefile
index 607f9c96129844c61d888f39908040f30cba8f66..98ebeac340d8ccdebaafa003b3a8127ad21b3ce1 100644 (file)
--- a/arch/arm/mach-rockchip/rk3399/Makefile
+++ b/arch/arm/mach-rockchip/rk3399/Makefile
@@ -4,5 +4,6 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
+obj-y += clk_rk3399.o
 obj-y += rk3399.o
 obj-y += syscon_rk3399.o

diff --git a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
new file mode 100644 (file)
index 0000000..7663591
--- /dev/null
+++ b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <syscon.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/cru_rk3399.h>
+
+int rockchip_get_clk(struct udevice **devp)
+{
+       return uclass_get_device_by_driver(UCLASS_CLK,
+                       DM_GET_DRIVER(rockchip_rk3399_pmuclk), devp);
+}
+
+void *rockchip_get_cru(void)
+{
+       struct rk3399_clk_priv *priv;
+       struct udevice *dev;
+       int ret;
+
+       ret = rockchip_get_clk(&dev);
+       if (ret)
+               return ERR_PTR(ret);
+
+       priv = dev_get_priv(dev);
+
+       return priv->cru;
+}

diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 8efb8926067584d04b6ac54d6b452df8ee7c1d1c..2e87e4b62d596d423f0cd7b5d2def4e14e83f627 100644 (file)
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -18,11 +18,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-struct rk3399_clk_priv {
-       struct rk3399_cru *cru;
-       ulong rate;
-};
-
 struct rk3399_pmuclk_priv {
        struct rk3399_pmucru *pmucru;
 };
@@ -780,25 +775,6 @@ static struct clk_ops rk3399_clk_ops = {
        .set_rate = rk3399_clk_set_rate,
 };
 
-void *rockchip_get_cru(void)
-{
-       struct udevice *dev;
-       fdt_addr_t *addr;
-       int ret;
-
-       ret = uclass_get_device_by_driver(UCLASS_CLK,
-                       DM_GET_DRIVER(clk_rk3399), &dev);
-
-       if (ret)
-               return ERR_PTR(ret);
-
-       addr = dev_get_addr_ptr(dev);
-       if ((fdt_addr_t)addr == FDT_ADDR_T_NONE)
-               return ERR_PTR(-EINVAL);
-
-       return addr;
-}
-
 static int rk3399_clk_probe(struct udevice *dev)
 {
        struct rk3399_clk_priv *priv = dev_get_priv(dev);
@@ -992,7 +968,7 @@ static const struct udevice_id rk3399_pmuclk_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(pmuclk_rk3399) = {
+U_BOOT_DRIVER(rockchip_rk3399_pmuclk) = {
        .name           = "pmuclk_rk3399",
        .id             = UCLASS_CLK,
        .of_match       = rk3399_pmuclk_ids,