From patchwork Mon Dec 11 11:58:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Yan X-Patchwork-Id: 176622 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6988997vqy; Mon, 11 Dec 2023 03:59:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFRoSG6/DfiS0se+W2hVforq090BzK/vFAInmxF2z5QVDN9mmlqvYEYkzofCmkof4d3Cn32 X-Received: by 2002:a05:6e02:12ec:b0:35d:37e8:7f8b with SMTP id l12-20020a056e0212ec00b0035d37e87f8bmr7623935iln.5.1702295981842; Mon, 11 Dec 2023 03:59:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702295981; cv=none; d=google.com; s=arc-20160816; b=cOpXtyY8RqQVXmaRXZJurw5Tb+FrmnG2tneYhr3GP7TRgV13y359YbRb7A8GTPZuZp rHUmAGOuYwvs22gPItVqRi0ZSc+bjjzPmefMBOjmkYyBuGRL7XmUhRwZkyR4hy6ZxUvq Po8T4/PwjcgRWm1MTv6J5WEWK+/sSkB7I9ByXNVX8JEbREf9/Ug5/1fMC46VKcvs3Ib0 xPJp0zjjhajK0CjyIcqSjSrXlLFtxy89YCG5MxKn8eXCVmPqap/0p2FkGOF+J4n2WIwi qWtKhk1D7TlmSk0D0in/085TvCJ/irYqi96h7k8sULifH8ovnchynMob3F1tlIDvhHb8 Sjcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ivYwG0i8GvTy5B3DD4RgxIA/V22tX/s2NpyT/lti0eQ=; fh=+5kJMU8Psdtt0Ga5ffI2YagkhMdQc/rz38hgRcNs5u0=; b=tUberE7KWFMiR9WmacJIot/2g0edEz5aSXhsulSCAbqljnpKV2JTRbZvjbJWsR8O54 YEKPNn91Dm9dlPOGMa//6+6qc3imjX45U/YjwaePEIw4fmkcmoRb9yzIXiknZNUlwYSb KkB10G1tijmFDgv2j4U+qP+15q67PYZ95MagB0FPyo7hcBnOYk8ktmfkdW9OF+8EPeYG 8NwpOozQfN3/BNQMoLEwulrhkuhZYNviJFZwbfBJkvPEFIuiIxYMkL7jSOSBNEkszpjm vqHFvYselKu1jRv00Kxst0Yf14gO5rdq2DhkXpZr9muCY5bRrketRAXtGyDyDnHvGr4Y OEpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=hGpFQL3B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id cm22-20020a056a020a1600b005b999968b87si6226625pgb.580.2023.12.11.03.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Dec 2023 03:59:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=hGpFQL3B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 980A78060012; Mon, 11 Dec 2023 03:59:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234498AbjLKL71 (ORCPT + 99 others); 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 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 X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_SORBS_WEB, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 11 Dec 2023 03:59:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784986711500482596 X-GMAIL-MSGID: 1784986711500482596 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; - struct regmap *grf; + struct regmap *sys_grf; /* physical map length of vop2 register */ u32 len; @@ -1524,9 +1524,9 @@ static void rk3568_set_intf_mux(struct vop2_video_port *vp, int id, dip &= ~RK3568_DSP_IF_POL__RGB_LVDS_PIN_POL; dip |= 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 &= ~RK3568_SYS_DSP_INFACE_EN_HDMI_MUX; @@ -2768,7 +2768,7 @@ static int vop2_bind(struct device *dev, struct device *master, void *data) return PTR_ERR(vop2->lut_regs); } - vop2->grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); + vop2->sys_grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf"); vop2->hclk = devm_clk_get(vop2->dev, "hclk"); if (IS_ERR(vop2->hclk)) {