clk: convert API to match reset/mailbox style

[people/ms/u-boot.git] / drivers / video / rockchip / rk_vop.c

diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index db09d9a41df76679aa2bcd1588231597fe7adbb6..cc26f1956d39a7569c70d7b3c49ed545c168ca55 100644 (file)
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -195,7 +195,8 @@ int rk_display_init(struct udevice *dev, ulong fbbase,
        struct udevice *disp;
        int ret, remote, i, offset;
        struct display_plat *disp_uc_plat;
-       struct udevice *clk;
+       struct udevice *dev_clk;
+       struct clk clk;
 
        vop_id = fdtdec_get_int(blob, ep_node, "reg", -1);
        debug("vop_id=%d\n", vop_id);
@@ -237,11 +238,13 @@ int rk_display_init(struct udevice *dev, ulong fbbase,
                return ret;
        }
 
-       ret = rkclk_get_clk(CLK_NEW, &clk);
+       ret = uclass_get_device(UCLASS_CLK, 0, &dev_clk);
        if (!ret) {
-               ret = clk_set_periph_rate(clk, DCLK_VOP0 + remote_vop_id,
-                                         timing.pixelclock.typ);
+               clk.id = DCLK_VOP0 + remote_vop_id;
+               ret = clk_request(dev_clk, &clk);
        }
+       if (!ret)
+               ret = clk_set_rate(&clk, timing.pixelclock.typ);
        if (ret) {
                debug("%s: Failed to set pixel clock: ret=%d\n", __func__, ret);
                return ret;