rockchip: video: Correct VOP clock selection
authorSimon Glass <sjg@chromium.org>
Sun, 13 Nov 2016 21:21:56 +0000 (14:21 -0700)
committerSimon Glass <sjg@chromium.org>
Sat, 26 Nov 2016 00:59:30 +0000 (17:59 -0700)
This code incorrectly uses the oscillator. It should use the clock
selected in the device tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: 135aa95 (clk: convert API to match reset/mailbox style)

drivers/video/rockchip/rk_vop.c

index c6d88d9..130dace 100644 (file)
@@ -195,7 +195,6 @@ 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 *dev_clk;
        struct clk clk;
 
        vop_id = fdtdec_get_int(blob, ep_node, "reg", -1);
@@ -238,11 +237,7 @@ int rk_display_init(struct udevice *dev, ulong fbbase,
                return ret;
        }
 
-       ret = rockchip_get_clk(&dev_clk);
-       if (!ret) {
-               clk.id = DCLK_VOP0 + remote_vop_id;
-               ret = clk_request(dev_clk, &clk);
-       }
+       ret = clk_get_by_index(dev, 1, &clk);
        if (!ret)
                ret = clk_set_rate(&clk, timing.pixelclock.typ);
        if (ret) {