From 436e63d852592bf7a16b13d5eac578f5cb983531 Mon Sep 17 00:00:00 2001 From: Zhang Yubing Date: Fri, 6 May 2022 18:19:28 +0800 Subject: [PATCH] drm/rockchip: vop2: move expend clk in display sub-system node Moving expend clk in display sub-system node, which make it easier when add extend clk for vop. Signed-off-by: Zhang Yubing Change-Id: I3175d54c8a44fc6b205fcd3623e3c5656b308fe8 --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index afe237dd8a89..788d74cf047c 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -3463,6 +3463,7 @@ static int vop2_extend_clk_init(struct vop2 *vop2) { const char * const extend_clk_name[] = { "hdmi0_phy_pll", "hdmi1_phy_pll"}; + struct drm_device *drm_dev = vop2->drm_dev; struct clk *clk; struct vop2_extend_pll *extend_pll; int i; @@ -3473,14 +3474,14 @@ static int vop2_extend_clk_init(struct vop2 *vop2) return 0; for (i = 0; i < ARRAY_SIZE(extend_clk_name); i++) { - clk = devm_clk_get(vop2->dev, extend_clk_name[i]); + clk = devm_clk_get(drm_dev->dev, extend_clk_name[i]); if (IS_ERR(clk)) { - dev_warn(vop2->dev, "failed to get %s: %ld\n", + dev_warn(drm_dev->dev, "failed to get %s: %ld\n", extend_clk_name[i], PTR_ERR(clk)); continue; } - extend_pll = devm_kzalloc(vop2->dev, sizeof(*extend_pll), GFP_KERNEL); + extend_pll = devm_kzalloc(drm_dev->dev, sizeof(*extend_pll), GFP_KERNEL); if (!extend_pll) return -ENOMEM;