Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/rockchip: vop2: rename grf to sys_grf

The vop2 need to reference more grf(system grf, vop grf, vo0/1 grf,etc)
in the upcoming rk3588.

So we rename the current system grf to sys_grf.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20231211115826.1785190-1-andyshrk@163.com

authored by

Andy Yan and committed by
Heiko Stuebner
c408af1a 075a5b39

+4 -4
+4 -4
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
··· 190 190 void __iomem *regs; 191 191 struct regmap *map; 192 192 193 - struct regmap *grf; 193 + struct regmap *sys_grf; 194 194 195 195 /* physical map length of vop2 register */ 196 196 u32 len; ··· 1524 1524 dip &= ~RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL; 1525 1525 dip |= FIELD_PREP(RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL, polflags); 1526 1526 if (polflags & POLFLAG_DCLK_INV) 1527 - regmap_write(vop2->grf, RK3568_GRF_VO_CON1, BIT(3 + 16) | BIT(3)); 1527 + regmap_write(vop2->sys_grf, RK3568_GRF_VO_CON1, BIT(3 + 16) | BIT(3)); 1528 1528 else 1529 - regmap_write(vop2->grf, RK3568_GRF_VO_CON1, BIT(3 + 16)); 1529 + regmap_write(vop2->sys_grf, RK3568_GRF_VO_CON1, BIT(3 + 16)); 1530 1530 break; 1531 1531 case ROCKCHIP_VOP2_EP_HDMI0: 1532 1532 die &= ~RK3568_SYS_DSP_INFACE_EN_HDMI_MUX; ··· 2767 2767 return PTR_ERR(vop2->lut_regs); 2768 2768 } 2769 2769 2770 - vop2->grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); 2770 + vop2->sys_grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); 2771 2771 2772 2772 vop2->hclk = devm_clk_get(vop2->dev, "hclk"); 2773 2773 if (IS_ERR(vop2->hclk)) {