summaryrefslogtreecommitdiff
path: root/drivers/video/rockchip
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-11-13 14:21:56 -0700
committerSimon Glass <sjg@chromium.org>2016-11-25 17:59:30 -0700
commit9ed682606076ccc2163d271af1795f00c0217446 (patch)
treeb4f4c0300612057044d2ecfbef980d164231a0ae /drivers/video/rockchip
parente4ab3d712a52e69d154ed9a1fb15e56e9f9c94d3 (diff)
rockchip: video: Correct VOP clock selection
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)
Diffstat (limited to 'drivers/video/rockchip')
-rw-r--r--drivers/video/rockchip/rk_vop.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c
index c6d88d9225..130dace740 100644
--- a/drivers/video/rockchip/rk_vop.c
+++ b/drivers/video/rockchip/rk_vop.c
@@ -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) {