From patchwork Sat Jan 25 01:15:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhangqing X-Patchwork-Id: 13950080 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AD5BAC0218B for ; Sat, 25 Jan 2025 01:17:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/anGkf2igP9SKOSzCFL/ChT8CaIIzLztcOi6KLOhh+8=; b=D5+Bnn+MYt6YQF/XjJH38UhBl/ nPpV6WpgIGwwBFKUCEkA6PuhJDR4aDVawt+bLq2DFWdPbX/pvklVkKojyMeEuQSxW5VROZ+PL8/Y2 pXnTmuTelcA8wWmN1BsyNYAecPc12bH91AtW0RmaNU+IKYXiLtoDHzZ4iEalJ1TAnaPw4w7e/3ToO QtKBzt4bAGPsLK9u3xztbnMKT6+WkmeI3RFegUIIEi7tGHfIj56SObTWsAShmhiueW799LLt+UlO3 so0yj+YUU50L8yUr5AGaWJlKpkPum4H97lRn+mICcj0JunxWwLYUTEJPJ+eX17WABC6f/xzFU9Zo5 mBKacghw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tbUnV-0000000FqwQ-2h0h; Sat, 25 Jan 2025 01:17:17 +0000 Received: from mail-m1973173.qiye.163.com ([220.197.31.73]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tbUmB-0000000FqjK-2ioK; Sat, 25 Jan 2025 01:15:57 +0000 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 9a2d132a; Sat, 25 Jan 2025 09:15:50 +0800 (GMT+08:00) From: Elaine Zhang To: mturquette@baylibre.com, sboyd@kernel.org, kever.yang@rock-chips.com, zhangqing@rock-chips.com, heiko@sntech.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-clk@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, huangtao@rock-chips.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/3] Revert "clk: rockchip: Set parent rate for DCLK_VOP clock on RK3228" Date: Sat, 25 Jan 2025 09:15:43 +0800 Message-Id: <20250125011545.15547-2-zhangqing@rock-chips.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250125011545.15547-1-zhangqing@rock-chips.com> References: <20250125011545.15547-1-zhangqing@rock-chips.com> X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZQxpNGlZMHR9NTx9DT0keGkNWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSUJDQ0 1VSktLVUtZBg++ X-HM-Tid: 0a949b078cc903a3kunm9a2d132a X-HM-MType: 1 X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6ODI6ASo5FzIJPBoVDSMCPRxD KiNPFBdVSlVKTEhMTE1MTE5JSkpCVTMWGhIXVQETGhUcChIVHDsJFBgQVhgTEgsIVRgUFkVZV1kS C1lBWU5DVUlJVUxVSkpPWVdZCAFZQUpJSUM3Bg++ DKIM-Signature: a=rsa-sha256; b=Iw6uicYdSrfMTm+P4sIGI8p9s3WIGo8zs6TyvqIH7GzyWRaUNlqfaZ7l0ddwcbcPtA7MhxWMqX87oq3B5fLkya8y2q5IxqJ9i0x/ogFJdEOzR7V3xM95vFITAj6X9wPEbGAIM5GNd+n8oXXinhAfioFWCNaeb1uiveIgHWAX2bo=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=/anGkf2igP9SKOSzCFL/ChT8CaIIzLztcOi6KLOhh+8=; h=date:mime-version:subject:message-id:from; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250124_171556_195840_25117F9D X-CRM114-Status: GOOD ( 10.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit 1d34b9757523c1ad547bd6d040381f62d74a3189. RK3228 Only GPLL and CPLL, GPLL is a common clock, does not allow dclk_vop to change its frequency, CPLL is used by GMAC, if dclk_vop use CLK_SET_RATE_PARENT and CLK_SET_RATE_NO_REPARENT flags will affect the GMAC function. If the client application does not use GMAC and CPLL is free, make this change on the local branch. Signed-off-by: Elaine Zhang --- drivers/clk/rockchip/clk-rk3228.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c index ed602c27b624..9c0284607766 100644 --- a/drivers/clk/rockchip/clk-rk3228.c +++ b/drivers/clk/rockchip/clk-rk3228.c @@ -409,7 +409,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = { RK2928_CLKSEL_CON(29), 0, 3, DFLAGS), DIV(0, "sclk_vop_pre", "sclk_vop_src", 0, RK2928_CLKSEL_CON(27), 8, 8, DFLAGS), - MUX(DCLK_VOP, "dclk_vop", mux_dclk_vop_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT, + MUX(DCLK_VOP, "dclk_vop", mux_dclk_vop_p, 0, RK2928_CLKSEL_CON(27), 1, 1, MFLAGS), FACTOR(0, "xin12m", "xin24m", 0, 1, 2), From patchwork Sat Jan 25 01:15:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhangqing X-Patchwork-Id: 13950087 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6859C02181 for ; Sat, 25 Jan 2025 01:20:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GbYBNys9Cs3StkfVLRUbOG4+n5LSGeTknUJSAePxf0s=; b=Qdz1mM/sfVEGF1KvVz9ksh2srx gK3Q9ynSUrDrdWnputun4OfkgSo45Jjef9IvvU3iY8xisGBkOT9c2A3mz+nFhKDurbx4958JPmyxA 8j2BUMzjMRe3+kg15M1WGUW5AISkMRf6XaZCufRpnbvx0jGuwO9/ttwB/gGsnumjgvZvCN82O7xCE rNl8japX71HrfsMQ4DRiVHPFyuYf34Nl66xMrA71l76quCNXV86FqjAAJTOWbCas5avs0QWMqYDvs SsynrmeQ6YDYfkI89BsWQzIgISpJGZD3fZ2U88aEHzldjeKezgKF+5G7ZrdOt/Pd/zXqmRnnLIzWn +J3M3u8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tbUq3-0000000FrIV-1RFR; Sat, 25 Jan 2025 01:19:55 +0000 Received: from mail-m1973181.qiye.163.com ([220.197.31.81]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tbUmC-0000000Fqjk-2XqZ; Sat, 25 Jan 2025 01:15:58 +0000 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 9a2d132f; Sat, 25 Jan 2025 09:15:52 +0800 (GMT+08:00) From: Elaine Zhang To: mturquette@baylibre.com, sboyd@kernel.org, kever.yang@rock-chips.com, zhangqing@rock-chips.com, heiko@sntech.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-clk@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, huangtao@rock-chips.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/3] Revert "arm64: dts: rockchip: Increase VOP clk rate on RK3328" Date: Sat, 25 Jan 2025 09:15:44 +0800 Message-Id: <20250125011545.15547-3-zhangqing@rock-chips.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250125011545.15547-1-zhangqing@rock-chips.com> References: <20250125011545.15547-1-zhangqing@rock-chips.com> X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGR5OHVZJGR9IHk1OTR9NTEJWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ X-HM-Tid: 0a949b07922703a3kunm9a2d132f X-HM-MType: 1 X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6N0k6Dxw*LjIXNBoLDSMKPRUw IksKCTJVSlVKTEhMTE1MTE5ITkpJVTMWGhIXVQETGhUcChIVHDsJFBgQVhgTEgsIVRgUFkVZV1kS C1lBWU5DVUlJVUxVSkpPWVdZCAFZQUpLTUo3Bg++ DKIM-Signature: a=rsa-sha256; b=YGQQjOr7ey6VOa/L58cxEdtV8JlgR6SsYj9LwimXFQY6K2lC06Z4vFJTkyjmKJDzfjgDPACM0GU4TYtrVQ6wgM4ybTbd7nj71CVuMfjtA1FFpROwi78hZfvwjd5RSvBQuS5c0pG/J7T6Fi3kSSCf1dqjlhG3RZztMWGzTQ8d7ZA=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=GbYBNys9Cs3StkfVLRUbOG4+n5LSGeTknUJSAePxf0s=; h=date:mime-version:subject:message-id:from; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250124_171556_813946_9D54D5B2 X-CRM114-Status: UNSURE ( 8.65 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit 0f2ddb128fa20f8441d903285632f2c69e90fae1. Before changing the PLL frequency, in order to avoid overclocking the child clock, set the child clock to a large div first, and then set the CLK as required after the PLL is set. Fixes: 0f2ddb128fa2 ("arm64: dts: rockchip: Increase VOP clk rate on RK3328") Signed-off-by: Elaine Zhang --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index 7d992c3c01ce..f3ef8cbfbdae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -852,8 +852,8 @@ <0>, <24000000>, <24000000>, <24000000>, <15000000>, <15000000>, - <300000000>, <100000000>, - <400000000>, <100000000>, + <100000000>, <100000000>, + <100000000>, <100000000>, <50000000>, <100000000>, <100000000>, <100000000>, <50000000>, <50000000>, From patchwork Sat Jan 25 01:15:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhangqing X-Patchwork-Id: 13950088 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6AC2C02181 for ; Sat, 25 Jan 2025 01:21:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5XL1oRgjrMvBC7HZIH3WlKDBfELy6YvngrqD5H+FELs=; b=KlqoT5ClNIOkNQ4naLlr4Ocp58 xYTmc5WOaNoJ9UP+KKvqmcRrSOPS4IC/uapTCQ/AoY1IZgfGAyzKsQaOpzCqjcP9T2NB+DYFJA3Sx j4i7A4IXtzTZroj+QzhoWifrL+N8p4fQYm0cguBTOjkCdzeYEbMsGY4t2UoCBYJBv8ne/Gv+jsTey EbSnn6ynMg3mSW4JHZIn0/JMycRR3gBqQRR2/MK9ONNmuUxRtfrthqfPEpDnurX87nIrGzxci7jwK 9lckszfHWp1mkuUxaKQfk455Sq4//IHHwK9gOiw5BOre0+Z7LfaPX0rmWVcBrMHy4ytRxqfJcP5M2 RALDNe7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tbUrJ-0000000FrR6-1NsQ; Sat, 25 Jan 2025 01:21:13 +0000 Received: from mail-m3281.qiye.163.com ([220.197.32.81]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tbUmE-0000000Fqjl-0Br2; Sat, 25 Jan 2025 01:15:59 +0000 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 9a2d1331; Sat, 25 Jan 2025 09:15:53 +0800 (GMT+08:00) From: Elaine Zhang To: mturquette@baylibre.com, sboyd@kernel.org, kever.yang@rock-chips.com, zhangqing@rock-chips.com, heiko@sntech.de, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-clk@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, huangtao@rock-chips.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/3] arm64: dts: rockchip: Increase VOP clk rate on RK3328 Date: Sat, 25 Jan 2025 09:15:45 +0800 Message-Id: <20250125011545.15547-4-zhangqing@rock-chips.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20250125011545.15547-1-zhangqing@rock-chips.com> References: <20250125011545.15547-1-zhangqing@rock-chips.com> X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZQhpCS1YdQ0oaGE5NTk1KTB5WFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ X-HM-Tid: 0a949b07979903a3kunm9a2d1331 X-HM-MType: 1 X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6OE06EAw6HTIWLBopQi0ePQpD EgoaCVFVSlVKTEhMTE1MTE5PQk9JVTMWGhIXVQETGhUcChIVHDsJFBgQVhgTEgsIVRgUFkVZV1kS C1lBWU5DVUlJVUxVSkpPWVdZCAFZQUpJSUo3Bg++ DKIM-Signature: a=rsa-sha256; b=b4WwNxdX7lD64Xgn+Ba2i0xa3x5BwqzyI6b/EFkUtuSD1P4sUYqaHi99dIH3r6R/ErcTQlDGiEQg/HETtpN8Ul7Fc3zz1tIbUyB/lha82hOo+QvPF5JYMW5BVg2RHXbzVGvuUyIo4qxOMtiOyHboxbZCJkyu8rJxExHmjGUXP9g=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=5XL1oRgjrMvBC7HZIH3WlKDBfELy6YvngrqD5H+FELs=; h=date:mime-version:subject:message-id:from; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250124_171558_251676_F7E7F3D3 X-CRM114-Status: UNSURE ( 7.12 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The VOP on RK3328 needs to run at a higher rate in order to produce a proper 3840x2160 signal. Change to use 300MHz for VIO clk and 400MHz for VOP clk. Fixes: 0f2ddb128fa2 ("arm64: dts: rockchip: Increase VOP clk rate on RK3328") Signed-off-by: Elaine Zhang --- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index f3ef8cbfbdae..0c905f411e92 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -842,7 +842,8 @@ <&cru ACLK_BUS_PRE>, <&cru HCLK_BUS_PRE>, <&cru PCLK_BUS_PRE>, <&cru ACLK_PERI_PRE>, <&cru HCLK_PERI>, <&cru PCLK_PERI>, - <&cru SCLK_RTC32K>; + <&cru SCLK_RTC32K>, <&cru ACLK_VIO_PRE>, + <&cru ACLK_VOP_PRE>; assigned-clock-parents = <&cru HDMIPHY>, <&cru PLL_APLL>, <&cru PLL_GPLL>, <&xin24m>, @@ -863,7 +864,8 @@ <150000000>, <75000000>, <75000000>, <150000000>, <75000000>, <75000000>, - <32768>; + <32768>, <300000000>, + <400000000>; }; usb2phy_grf: syscon@ff450000 {