From patchwork Tue Apr 8 06:31:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 14042223 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 50D88C369A1 for ; Tue, 8 Apr 2025 06:31:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=J6u3jSIOon3hmKMeRx5SlMBw9CCsWg5qBXAVUQ1SrYY=; b=BYq1soiQoYWMbJ SJD5HlGc/HRvsD9uP/ChtF8HxYmifWcO8nGp978veJjWZZbd480hIpwZEtDW6/acl6dEnBqVht1Di mEGLiFr5mHP+xMrxJAPhzWpiUDaSbN36elSN3cIYqX3hF4RUZ8Fa221Y80IQ60WXmUgIUGSvlZOm1 lTcAlFWaEwJpsqoejb4me7XuZFGoYK6KVhRIYIynalibnsO0LsxP3vKVEugCP4wEWqGJjbV+ZSO3g 8uIIUqIvltioyZs0V0Fe+xQsUp9DCZBX5auxriI6Jkls1ImQr+/zvDlzqH00RvBP8M4DfcN4i4heH aBR3bYJwEkdTsOv2rAYQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u22Us-00000002uz8-3iv8; Tue, 08 Apr 2025 06:31:46 +0000 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u22Ur-00000002uxY-0FX9; Tue, 08 Apr 2025 06:31:46 +0000 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-30c416cdcc0so43482311fa.2; Mon, 07 Apr 2025 23:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744093903; x=1744698703; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ORX98YSk1SNy2hJueg/F5TqpKLL+TPlVQ1FPNGGwME4=; b=kk38YFhWRiJIlO1nLzMB3Ez65Sw66A1pcz9Jjay6pLNdEamfD4Az1xRN22O0ITsh6R K/RpnTghQH9slxjJ6HKuVd2Xd2Etrfjh34Dq+oYHSbVCD1qnt6TxhVqms9CMuHRRwv9E 8rgJJWk5p0XIt3JibqdCeQY5acUo/A/cRoQE7cbKFZlAvO10osh9LyVGx4vWR2ZJTIWu SPIHrNAJtCf72TvxTfYGfNasIlKZJPiwGQyz1LF2v2NMhylLj8Oo2WovzAjuS8Ii1FNu 31pjoZBt3eZhtBhEbd01s8FZ3PD4aChGb70CWk8K6pFsnypF2t+Ls7x4WfDfyY+SQ9YE Ri8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744093903; x=1744698703; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ORX98YSk1SNy2hJueg/F5TqpKLL+TPlVQ1FPNGGwME4=; b=wCEvV7WQ8fdItTOVHAPzdBEoE/hz2m3zN87R4zsODyzlvK9emdORHxRvkC+GblCKTH X68rLWCXwu8wxycG2/TSI6d/zLpnWe6i9SWnOP2RhiUGBhfJVA2aX67cuQA7tv5Xq6qy eNdgr1P07E+7gTDWob8xdSYijNukvIBWy2/ofNZDA/Ekqacxpty/r9OYXB8nPDce+s0M B71TZZ5/Ty4oh7gKixyJsuXWxjSvvyPctCZRh/Pyf8TAX+Sn3Zw5MSbWpOqQJsRb4jQH olgon0q/gnD7fPn2VwPsCGzLcdX/aPZSi48HfhfDXr7ZkBnxlS7zfCDc8Av9dZNRAji3 7iPw== X-Forwarded-Encrypted: i=1; AJvYcCVyel2hSmKM48StR/Bzefnt6KvXB8ztuIq+MbuCzro4vBbPrsp1jEozvitIG0GDZI7sxfmbtON2NaPcEOT3bhjT@lists.infradead.org X-Gm-Message-State: AOJu0YxMbCTWb4WbmPdj9I8QaheALfzJ6Mq7noHyhybKSzaAuwIMBMGi oOSQw8OYZUs0J5PvflVTxK//uUuypZK/de6fBOhALZ0jsNQphKqxA/VCNKb3 X-Gm-Gg: ASbGncvmU80vgWiLC4PhYflEYj9YZ8PDLwS27zb+w836xtprQf35tXGcL7YTfLlRdst iOLo31TgdrviVM3c00Kiz8aiMavS6tMJpJ1VrHG3U0nODCHS5NlHXJ6KiSSj/Gj0LQVWchsbz72 BqT1GVGS2bOdQDO5Qmxr/4CQUYsQIKgmSbkpPp87+FljXUbHI1CYWtrLpNM84ivVEnzFD7GJSFO DWWhHxNRIAgJ1g/EGLF+2IBnveTuHIwg60aN8S4gtAvX3lxNup60ubNPVntPubs5JuNSbZ4Pvkp Xi5T2O0RvaG6dE+yMdJ8e2nFeZdi6Yo1bGos15fha1iYEOtqvXytD9j3R0m9Z03u/yo= X-Google-Smtp-Source: AGHT+IGVMk4G7cBj7vxqRy8K2XvNzy6mPoK2OkwsHGUDZkSEYRt9KAqJNzY8PIdw+o5TykPCy55P3A== X-Received: by 2002:a05:651c:1442:b0:30c:1002:faa8 with SMTP id 38308e7fff4ca-30f0a0f0a65mr45654541fa.7.1744093902472; Mon, 07 Apr 2025 23:31:42 -0700 (PDT) Received: from localhost.localdomain ([188.243.23.53]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30f03125862sm19141801fa.3.2025.04.07.23.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 23:31:41 -0700 (PDT) From: Alexander Shiyan To: linux-rockchip@lists.infradead.org Cc: Michael Turquette , Stephen Boyd , Heiko Stuebner , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexander Shiyan Subject: [PATCH 1/2] clk: rockchip: clk-pll: Fix CRU_xx_CON2 register usage Date: Tue, 8 Apr 2025 09:31:25 +0300 Message-Id: <20250408063126.38904-1-eagle.alexander923@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_233145_100582_83090E9F X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org According to RK3588 TRM, CRU_(CPLL/GPLL/etc)_CON2 register (rate-k value) does not use highword write enable mask. Lets fix this. Signed-off-by: Alexander Shiyan --- drivers/clk/rockchip/clk-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c index 2c2abb3b4210..77ba4d6e7b5f 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -959,7 +959,7 @@ static int rockchip_rk3588_pll_set_params(struct rockchip_clk_pll *pll, HIWORD_UPDATE(rate->s, RK3588_PLLCON1_S_MASK, RK3588_PLLCON1_S_SHIFT), pll->reg_base + RK3399_PLLCON(1)); - writel_relaxed(HIWORD_UPDATE(rate->k, RK3588_PLLCON2_K_MASK, RK3588_PLLCON2_K_SHIFT), + writel_relaxed((rate->k & RK3588_PLLCON2_K_MASK) << RK3588_PLLCON2_K_SHIFT, pll->reg_base + RK3399_PLLCON(2)); /* set pll power up */ From patchwork Tue Apr 8 06:31:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 14042224 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 83C15C3600C for ; Tue, 8 Apr 2025 06:33:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=glKokuVFn4UWRKiGAd4ePDq5SMavgh6mJMMNew5yy4U=; b=kLvcZZc0EvbiXi LHfVI+/HW4bAHC0CVq2nHu23ad4rPR3rQwBOPxNLiqlynhxUclMwpl/vXw3Lo2REfRw23Pdm0xE/X 6tNcTZgI83W1SeA0z2Ud4gRsM62tNyv1qku/GdMfjlqVHIz0gXuIgRXcYWjeVHMiq1QviRO1Y84pp KPFVLWFR8fgHdRcAOjVO/WcGZkTsKE9IPxkSfGbBUiDqmhD44asuSUa3tsJZhRvNon5rklBGJl6CO 0teupv75dZ8/YIjxc3gy2xskKBjfpg3okWiu//jnPgZxFoC5lI07vFmXLy7wTiG5qzBH7AYCM+xYF 2kekQSfqjFeloRfaXROQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.1 #2 (Red Hat Linux)) id 1u22Wd-00000002vEe-0evc; Tue, 08 Apr 2025 06:33:35 +0000 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by bombadil.infradead.org with esmtps (Exim 4.98.1 #2 (Red Hat Linux)) id 1u22Us-00000002uy7-38vz; Tue, 08 Apr 2025 06:31:48 +0000 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-54963160818so6485257e87.2; Mon, 07 Apr 2025 23:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744093904; x=1744698704; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0/j7X89O9xO0mUxcRUMJWfkgUvGR1hQnYHcZiDSC8zs=; b=EXxSUEN8a/1h7wE7eVtcBWpaFO0FNMuYJZWQ82GYJ1coweaV8rwe1+MQI/9+FKPaKI cIvu57Ed/Fy5KbGZnPPxjsJ/ItUsE+E7WXNuMV8plPOshiX08Fw215zKBuRORYuEqHTy 6L2LQe14tUQIqkns2PWC5bnlWRa2fRvGJHMXEtJFzrNDMQgveCJF64HCPDMftzfSNx2R z4/eMd+ziYroomEcEke//t/qL0nIbdMjRRxCl2vRiInaV78zuBLtpWkwj8z0VLvdrLl4 Ipr8L0mbPe/N8Q4l1XxYlaTHGVEBIZ8q1qtmhvWi/HnaikMLGlu5VTVpbQ8605vjXEKW MhZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744093904; x=1744698704; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0/j7X89O9xO0mUxcRUMJWfkgUvGR1hQnYHcZiDSC8zs=; b=UofSc6aoakDOCsgd/aZeuAif8KkhxyYWU+3RDl3CkORJ9EkKikO0p10B2+JtaOoRui ZMZ82Wb47jNkWNHEN0Jp+ghjA2W1d+1RuiuSaoajgUWkMJfF6ZV0BuvPcJvvm3ny0uYm /Hty6GG3CB2voBL+SwJaknXMIq3MtihU07bZru+Eon/W1wegeQyERskGEgQp1pRaUnCD 6tVNVM1otk/kwa531pOS1EmjDbDDaF3lQSbKfnHlLJ+/yfkbAeQNpNkXvdJrF+NKWrEK p1b8HlGIEfRkCWWVRbtdeT7WfpgLH7X1rPsfoAuxzkNL09lBXjJTZHGSwpmlKreQ9yCl 0itg== X-Forwarded-Encrypted: i=1; AJvYcCUQujSSXd8FOs8EFy+U8v6ls+c1ywSsSPPwch7WPTDNMEXij7GTpzv6ZKqCScBawj/RBsiOZYPWeLvCbbzVjJM7@lists.infradead.org X-Gm-Message-State: AOJu0Yx2uYb65BCqYMnOF4Rrv6vTUluEhL6axfGn6G0ckCcQX1k9PT4c pyiXWFiaA2SSht5jTA408XdLwgVaGXvbExmGnY90l5ntnbngy4mNaaPX66Vs X-Gm-Gg: ASbGncs5j2i1QS+Cwfyt5oRrYLcuuBmQDk69+vtUaD2tgC5aRwySPS1hSEf68jjsfNz W1gBOnMThc7YVFluAbja11lmg0jSrsmYClgukTE8PbpjGrNrQcBKCmaZUqrHjnmKFAnRQwnpyE6 iFByHO5kqOz4s918k9pX4Rel8N7+0OmQWmMNBY1yDE9RS5yvVNFaArsmtOqL1AHsEsV6/ITcOYc TYZHnRy+yhTLNGKkO3bLHTFHRAqga99otNsjruQ2udu+yJnjVGzu/AtZ9jwTF9EpuE/m28xY5Oo 7pDlFTqUtYbT/5xWSlxaXi0CAeJ6JpuVp9tXc1kfGrgIiu7j15Oj1dBs61xwmOBZc/8= X-Google-Smtp-Source: AGHT+IFFROvjnZfAxfoyPcg5HrxbhQFOC3CDl1CKWR3dFbmCGB2xIAFGBL6OygaC+l2LUb1NElNYeQ== X-Received: by 2002:a05:651c:221a:b0:30d:e104:9ad3 with SMTP id 38308e7fff4ca-30f0c064a24mr33615061fa.40.1744093903907; Mon, 07 Apr 2025 23:31:43 -0700 (PDT) Received: from localhost.localdomain ([188.243.23.53]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30f03125862sm19141801fa.3.2025.04.07.23.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 23:31:42 -0700 (PDT) From: Alexander Shiyan To: linux-rockchip@lists.infradead.org Cc: Michael Turquette , Stephen Boyd , Heiko Stuebner , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexander Shiyan Subject: [PATCH 2/2] clk: rockchip: clk-pll: Typo fix Date: Tue, 8 Apr 2025 09:31:26 +0300 Message-Id: <20250408063126.38904-2-eagle.alexander923@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20250408063126.38904-1-eagle.alexander923@gmail.com> References: <20250408063126.38904-1-eagle.alexander923@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250407_233146_786320_6CE68C8F X-CRM114-Status: GOOD ( 10.26 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Fixed RK3399 -> RK3588 typo. No functional changes. Signed-off-by: Alexander Shiyan --- drivers/clk/rockchip/clk-pll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c index 77ba4d6e7b5f..6c5039bd661f 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c @@ -949,18 +949,18 @@ static int rockchip_rk3588_pll_set_params(struct rockchip_clk_pll *pll, /* set pll power down */ writel(HIWORD_UPDATE(RK3588_PLLCON1_PWRDOWN, RK3588_PLLCON1_PWRDOWN, 0), - pll->reg_base + RK3399_PLLCON(1)); + pll->reg_base + RK3588_PLLCON(1)); /* update pll values */ writel_relaxed(HIWORD_UPDATE(rate->m, RK3588_PLLCON0_M_MASK, RK3588_PLLCON0_M_SHIFT), - pll->reg_base + RK3399_PLLCON(0)); + pll->reg_base + RK3588_PLLCON(0)); writel_relaxed(HIWORD_UPDATE(rate->p, RK3588_PLLCON1_P_MASK, RK3588_PLLCON1_P_SHIFT) | HIWORD_UPDATE(rate->s, RK3588_PLLCON1_S_MASK, RK3588_PLLCON1_S_SHIFT), - pll->reg_base + RK3399_PLLCON(1)); + pll->reg_base + RK3588_PLLCON(1)); writel_relaxed((rate->k & RK3588_PLLCON2_K_MASK) << RK3588_PLLCON2_K_SHIFT, - pll->reg_base + RK3399_PLLCON(2)); + pll->reg_base + RK3588_PLLCON(2)); /* set pll power up */ writel(HIWORD_UPDATE(0, RK3588_PLLCON1_PWRDOWN, 0),