rockchip: clk: Update the rk3288 driver to support of-platdata
authorSimon Glass <sjg@chromium.org>
Mon, 4 Jul 2016 17:58:29 +0000 (11:58 -0600)
committerSimon Glass <sjg@chromium.org>
Fri, 15 Jul 2016 02:40:24 +0000 (20:40 -0600)
Add support for of-platdata with rk3288. This requires decoding the
of-platdata struct and setting up the devices from that. Also the driver
needs to be renamed to match the string that of-platdata will search for.

Signed-off-by: Simon Glass <sjg@chromium.org>
drivers/clk/clk_rk3288.c

index 1c2bf6423ec8c15fcb28c434963f14ccaf52b6a8..679f010bb7b1b1a47c77d9d7702f7cefbacf3f9d 100644 (file)
@@ -7,7 +7,9 @@
 #include <common.h>
 #include <clk-uclass.h>
 #include <dm.h>
+#include <dt-structs.h>
 #include <errno.h>
+#include <mapmem.h>
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+struct rk3288_clk_plat {
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+       struct dtd_rockchip_rk3288_cru dtd;
+#endif
+};
+
 struct rk3288_clk_priv {
        struct rk3288_grf *grf;
        struct rk3288_cru *cru;
@@ -785,9 +793,11 @@ static struct clk_ops rk3288_clk_ops = {
 
 static int rk3288_clk_ofdata_to_platdata(struct udevice *dev)
 {
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
        struct rk3288_clk_priv *priv = dev_get_priv(dev);
 
        priv->cru = (struct rk3288_cru *)dev_get_addr(dev);
+#endif
 
        return 0;
 }
@@ -800,6 +810,11 @@ static int rk3288_clk_probe(struct udevice *dev)
        if (IS_ERR(priv->grf))
                return PTR_ERR(priv->grf);
 #ifdef CONFIG_SPL_BUILD
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+       struct rk3288_clk_plat *plat = dev_get_platdata(dev);
+
+       priv->cru = map_sysmem(plat->dtd.reg[0], plat->dtd.reg[1]);
+#endif
        rkclk_init(priv->cru, priv->grf);
 #endif
 
@@ -823,11 +838,12 @@ static const struct udevice_id rk3288_clk_ids[] = {
        { }
 };
 
-U_BOOT_DRIVER(clk_rk3288) = {
-       .name           = "clk_rk3288",
+U_BOOT_DRIVER(rockchip_rk3288_cru) = {
+       .name           = "rockchip_rk3288_cru",
        .id             = UCLASS_CLK,
        .of_match       = rk3288_clk_ids,
        .priv_auto_alloc_size = sizeof(struct rk3288_clk_priv),
+       .platdata_auto_alloc_size = sizeof(struct rk3288_clk_plat),
        .ops            = &rk3288_clk_ops,
        .bind           = rk3288_clk_bind,
        .ofdata_to_platdata     = rk3288_clk_ofdata_to_platdata,