From patchwork Wed Nov 22 12:54:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Yan X-Patchwork-Id: 168351 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1299666vqb; Wed, 22 Nov 2023 04:57:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IEwNq+9Y7cylGF/7O0dK/ofS0ekEg/6bOu00s2gpHQWueEnn2jtMfCQoS+ayK/zBZ8K4TDD X-Received: by 2002:a17:902:d345:b0:1cc:62d0:6008 with SMTP id l5-20020a170902d34500b001cc62d06008mr2199011plk.55.1700657830157; Wed, 22 Nov 2023 04:57:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700657830; cv=none; d=google.com; s=arc-20160816; b=wnXWOOJuF8QkX3xf8J8H031ePI0iC+c2vROG0b9cfL3EH5phWITj+rgEvCIgZwe0eF kY2CD0oHj1TGVan5HufSBZSqzjA+V+89DahXTCGLEZ5GzW+rMgCs014jfUCeQIXfb1ID vRlkD+qpHQgkk3HNBMIlAVx02lpbu7UagY1jBflDojIEdvCtgvB8HcIs6CFNMppTYn+u AQUqC8Qq7lU0C9qJrPZS1rUMSPQ8sYH7WvcVRSswGv8kOAvDbTv6Xuw+g5heiywiH/Zs 5zw7NYLhSPXpgMns0dV4IFJts6ASgFsxZc3bM95cId6WQvR3JHSHZUHl0aVnurKtarT/ 34GQ== 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=9FUUTl4mJHWZBHX/cW0HDYACz3sr1ZV23gb+QcGkUx4=; fh=cjsv5ohN1TaMP82Yqeh0WKQ1fJXsn/LNnakMe8VYEy4=; b=j8Vt2Dj/nPbMckebrpJPkbWhUyayYflc+MrG0HXJbvhiHZJvGeFuNXRU3R1QNmilyJ x9LyxbN0ZETMTnWz0hLIlv+k2MaHy3rlq18Z5LhFBK5MODgEvrFIfCzO7xONdKYhMXNt yKthBfKR+vHiLv35b9zZvbwqj9xO4iM7Df8nMDvNkbfyadVNk0+XhTvxkwfAQFcp/4JI 2HaI473ljaYwOr0K+KxvUn8FpkipKdnh2cgXy/T2Ywyf/IMNJZTJEI6gJQnNOAlmtkeu AVD8qB+u6YxuNwhjtg22vH7flpf1//U7utzdU8Hd+lJjc7a4nRVUqqz3hHNcfx3lt4fu HFbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=AMCnMtE3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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. [23.128.96.32]) by mx.google.com with ESMTPS id t24-20020a1709028c9800b001c9c83947d1si12026612plo.645.2023.11.22.04.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 04:57:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=AMCnMtE3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 545E48069A34; Wed, 22 Nov 2023 04:56:20 -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 S1344266AbjKVMz5 (ORCPT + 99 others); Wed, 22 Nov 2023 07:55:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344209AbjKVMzr (ORCPT ); Wed, 22 Nov 2023 07:55:47 -0500 Received: from m12.mail.163.com (m12.mail.163.com [220.181.12.216]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9178DD52; Wed, 22 Nov 2023 04:55:42 -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=9FUUT l4mJHWZBHX/cW0HDYACz3sr1ZV23gb+QcGkUx4=; b=AMCnMtE3M5wFJN0ElxJfi zHxWoXcEDgR4XJVB9J502TY0/vUDC/a/UvSkb1GHWXBkJFDBEUt4r5/+xvvyGSXd ESpoB7OKAWh6gh3CVccMmqfJB75PwLzRYE+yc1qvFjz+Z32V5TB3zTFyU7ipJGYb jLgqjMNNGi7sHNmBBKXTzI= Received: from ProDesk.. (unknown [58.22.7.114]) by zwqz-smtp-mta-g3-4 (Coremail) with SMTP id _____wD3H9cf+l1ltCoCAw--.31562S2; Wed, 22 Nov 2023 20:54:58 +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, s.hauer@pengutronix.de, Andy Yan Subject: [PATCH v2 06/12] drm/rockchip: vop2: rename grf to sys_grf Date: Wed, 22 Nov 2023 20:54:54 +0800 Message-Id: <20231122125454.3454671-1-andyshrk@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231122125316.3454268-1-andyshrk@163.com> References: <20231122125316.3454268-1-andyshrk@163.com> MIME-Version: 1.0 X-CM-TRANSID: _____wD3H9cf+l1ltCoCAw--.31562S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFW7tFy3Ar18ur4xKr4kWFg_yoW8CFyUpa sxAFW2gr4xKrZFq3WvkFs8uFWakwn7CayIk3WIk3ZI9347tryDKFs8W3W5JrW3JrnruF4a qayqyry3Cay7Ar7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jSOJnUUUUU= X-Originating-IP: [58.22.7.114] X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiEAYwXl8YMqa0nQAAsC 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]); Wed, 22 Nov 2023 04:56:20 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783268984721219165 X-GMAIL-MSGID: 1783268984721219165 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 b32a291c5caa..4bcc405bcf11 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; @@ -1503,9 +1503,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; @@ -2764,7 +2764,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)) {