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

[u-boot] / drivers / clk / rockchip / clk_rv1108.c

diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
index 224c81355ee4ad563c18f44753596057c0b59db7..42341a856605841900e2c38f66661565d936eadb 100644 (file)
--- a/drivers/clk/rockchip/clk_rv1108.c
+++ b/drivers/clk/rockchip/clk_rv1108.c
@@ -209,11 +209,18 @@ static void rkclk_init(struct rv1108_cru *cru)
        printf("APLL: %d DPLL:%d GPLL:%d\n", apll, dpll, gpll);
 }
 
-static int rv1108_clk_probe(struct udevice *dev)
+static int rv1108_clk_ofdata_to_platdata(struct udevice *dev)
 {
        struct rv1108_clk_priv *priv = dev_get_priv(dev);
 
-       priv->cru = (struct rv1108_cru *)devfdt_get_addr(dev);
+       priv->cru = dev_read_addr_ptr(dev);
+
+       return 0;
+}
+
+static int rv1108_clk_probe(struct udevice *dev)
+{
+       struct rv1108_clk_priv *priv = dev_get_priv(dev);
 
        rkclk_init(priv->cru);
 
@@ -260,6 +267,7 @@ U_BOOT_DRIVER(clk_rv1108) = {
        .id             = UCLASS_CLK,
        .of_match       = rv1108_clk_ids,
        .priv_auto_alloc_size = sizeof(struct rv1108_clk_priv),
+       .ofdata_to_platdata = rv1108_clk_ofdata_to_platdata,
        .ops            = &rv1108_clk_ops,
        .bind           = rv1108_clk_bind,
        .probe          = rv1108_clk_probe,