From nobody Sun Dec 14 06:29:41 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55DBCC10DC3 for ; Mon, 11 Dec 2023 11:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234501AbjLKL71 (ORCPT ); Mon, 11 Dec 2023 06:59:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234820AbjLKL7N (ORCPT ); Mon, 11 Dec 2023 06:59:13 -0500 Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.219]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1F07710E; Mon, 11 Dec 2023 03:59:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=ivYwG 0i8GvTy5B3DD4RgxIA/V22tX/s2NpyT/lti0eQ=; b=hGpFQL3B1tq2R+3ICxkZ0 KMxJL1CWx1/tPMaXixkPlMb5fIGiE70fD1kpfXhNanfYfiuKi0Vi6gWfnjxEnzva Z4n6d+8JjGsZXbutlJXD6zcrg23w+Wnw6apCldxuvzSfNJEyrqDnvtg7wtNWKlcU GBfVVhB3kL8U2wdiNuRuHM= Received: from ProDesk.. (unknown [58.22.7.114]) by zwqz-smtp-mta-g1-2 (Coremail) with SMTP id _____wA3Lz5j+XZl9ZkABA--.22432S2; Mon, 11 Dec 2023 19:58:30 +0800 (CST) From: Andy Yan To: heiko@sntech.de Cc: hjc@rock-chips.com, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, krzysztof.kozlowski+dt@linaro.org, robh+dt@kernel.org, devicetree@vger.kernel.org, sebastian.reichel@collabora.com, kever.yang@rock-chips.com, chris.obbard@collabora.com, Andy Yan , Sascha Hauer Subject: [PATCH v5 08/16] drm/rockchip: vop2: rename grf to sys_grf Date: Mon, 11 Dec 2023 19:58:26 +0800 Message-Id: <20231211115826.1785190-1-andyshrk@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231211115547.1784587-1-andyshrk@163.com> References: <20231211115547.1784587-1-andyshrk@163.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wA3Lz5j+XZl9ZkABA--.22432S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFW7tFy3Ww1DKw4DurW5trb_yoW8Zr1fpa sxAay2gr4xGrZFqF1vkFs8CFWakws7CayIk3WIk3Wa9ry7tr98KFs8Wa45JrW3trnruF4a q3yqyry3CFy7Ar7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jDSdgUUUUU= X-Originating-IP: [58.22.7.114] X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbBEgpDXmVOA43CoAAAsC Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Andy Yan 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 Reviewed-by: Sascha Hauer --- (no changes since v1) drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index d52395b6aff7..64155b115744 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -190,7 +190,7 @@ struct vop2 { void __iomem *regs; struct regmap *map; =20 - struct regmap *grf; + struct regmap *sys_grf; =20 /* physical map length of vop2 register */ u32 len; @@ -1524,9 +1524,9 @@ static void rk3568_set_intf_mux(struct vop2_video_por= t *vp, int id, dip &=3D ~RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL; dip |=3D FIELD_PREP(RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL, polflags); if (polflags & POLFLAG_DCLK_INV) - regmap_write(vop2->grf, RK3568_GRF_VO_CON1, BIT(3 + 16) | BIT(3)); + regmap_write(vop2->sys_grf, RK3568_GRF_VO_CON1, BIT(3 + 16) | BIT(3)); else - regmap_write(vop2->grf, RK3568_GRF_VO_CON1, BIT(3 + 16)); + regmap_write(vop2->sys_grf, RK3568_GRF_VO_CON1, BIT(3 + 16)); break; case ROCKCHIP_VOP2_EP_HDMI0: die &=3D ~RK3568_SYS_DSP_INFACE_EN_HDMI_MUX; @@ -2768,7 +2768,7 @@ static int vop2_bind(struct device *dev, struct devic= e *master, void *data) return PTR_ERR(vop2->lut_regs); } =20 - vop2->grf =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf= "); + vop2->sys_grf =3D syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip= ,grf"); =20 vop2->hclk =3D devm_clk_get(vop2->dev, "hclk"); if (IS_ERR(vop2->hclk)) { --=20 2.34.1