From patchwork Tue Aug 6 12:11:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Virag X-Patchwork-Id: 13754730 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 48B3DC52D6F for ; Tue, 6 Aug 2024 12:15:21 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/Kr9OUWJu3zpHtEvcQkSwe6meHxvcJJnyUk+tmEInzk=; b=k4KMVN0VHixjG3CkA8u6VPA8RX SwgnoS99/35p1j/STt0mguqZrAVw6gAtYMzzK+eAgkfJWh7qUrtjplflRMVntauZCgXbj67Z1Rbvg /Iyf0dI5atneiSAnP7Qu/0ywdNre7ozG9qaD1YvTuQ+vj0kRQkGX9To+Z1SpgXD1viwYZZqZxRS58 sWmM+q64yixIo6Vnn4Z7XZYs44Jo6G9BwsSbV85YNg0yIYx610wnViRB9wrSFwC0+lf+ttb2oeka3 IT1k4GEOAjkQLVgiPx8xbzue3xDaGWgzgDheMwQmBArZAOtbDfKeArOEfhVB71GFS1Gcsoju3ZRGv RpGk/ujQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbJ5o-00000001TRQ-2IKw; Tue, 06 Aug 2024 12:15:08 +0000 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sbJ2T-00000001SKn-0G13 for linux-arm-kernel@lists.infradead.org; Tue, 06 Aug 2024 12:11:42 +0000 Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5bb477e3a6dso605695a12.0 for ; Tue, 06 Aug 2024 05:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722946299; x=1723551099; 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=/Kr9OUWJu3zpHtEvcQkSwe6meHxvcJJnyUk+tmEInzk=; b=kJLPNZAkvVvjMRURjc1mbT1vbDd5n6ywCVpSyoCqv1tcHqCU11UwIu95UxtE69Yhwl clkPtTpdXi1Dvl5Jtpv92qChDMMCqC1DV6xCuEULJwdX25UOQlGu0l6pqkqLQkUxdnSd KSr9UiQ00jAn22cWG9fqq4H/gmlQOd6kvOgO8JIl2/9NzhPdPgVv+ewB8vNlr7t97yHP mFaz9bkszMUJeUjlsf1gC/moxeIp7mR8Gf8msQnxSjCVE2LN69ftoqv5ZVh05HDIilsw 3R+WpmVZ0Als3oDGb3nDG4Ujcs+XzWe4NvfE2xvcQNz00ymn6mBTpfQLz+ZsmIGe50br 7qsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722946299; x=1723551099; 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=/Kr9OUWJu3zpHtEvcQkSwe6meHxvcJJnyUk+tmEInzk=; b=csBpud4ZGbWSt7Uzfon6PKVyu5+G0P6JV7c3T/tzzHeavruQ3lSMGakvJI+E34NElA uj4QTaCkPByHVmdrA5l2FTrzgnav4x4f+nYsv4B2wItm7b2VWrV/zrA1QRiT90MJbnGT GtUMwvFCuV5XSOtZz3mgory+dmojxmHc5bd7ZzmBr4qeqCKAjpsJflNcbZJDvqao6hJq h74dOHtMBzxgpxoVOXD4N8UWxztx783lwWkoKxzt1cR+vFAlF3Nh91aN+7xWLk9ljRe/ enxswfYqQqmzrXuPf0BWcMsiFWk0BiDAyLHy1wnTWzFe+Jcle16HUY2OxAQektFGKXEV Pzlw== X-Forwarded-Encrypted: i=1; AJvYcCW/AQCLhJp3umUB/jVtLWXP3zTd8g7k0BtY6V5tlLec46y4BhxDc182wXDtoekbuQ0D8pgtFW23YkxPkJ5b85nOfq4w5YuewdJaK2PsI5bbBTCa87o= X-Gm-Message-State: AOJu0YyXP6JA5yifp4MEp80oimHG4XckPl1hYwhHWA8Z9dOqUcyX1cs1 ATRCLT5vWBwinisC3SY48i0+xxok4fofGeg9OnpPgW2KRJ4YL5Mh X-Google-Smtp-Source: AGHT+IGA2ucJtDCPuKp3eCGFeHqBMSbY7zae2XhclUVfrwb6RcTfkCOleZ56MBKoDhIw0mDUOgcL/Q== X-Received: by 2002:a17:906:4789:b0:a7a:9447:3e91 with SMTP id a640c23a62f3a-a7dc4e9b1c4mr1065307866b.39.1722946298451; Tue, 06 Aug 2024 05:11:38 -0700 (PDT) Received: from localhost.localdomain ([2a02:ab88:3711:c80:e7a7:e025:f1a5:ef78]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-a7dc9ecb546sm542080366b.224.2024.08.06.05.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Aug 2024 05:11:38 -0700 (PDT) From: David Virag To: Krzysztof Kozlowski , Sylwester Nawrocki , Chanwoo Choi , Alim Akhtar , Michael Turquette , Stephen Boyd , Rob Herring , Conor Dooley , David Virag Cc: linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 6/7] clk: samsung: clk-pll: Add support for pll_1418x Date: Tue, 6 Aug 2024 14:11:49 +0200 Message-ID: <20240806121157.479212-7-virag.david003@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240806121157.479212-1-virag.david003@gmail.com> References: <20240806121157.479212-1-virag.david003@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240806_051141_115722_C0641984 X-CRM114-Status: GOOD ( 19.11 ) 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 pll1418x is used in Exynos7885 SoC for USB PHY clock. Operation-wise it is very similar to pll0822x, except that MDIV is only 9 bits wide instead of 10, and we use the CON1 register in the PLL macro's "con" parameter instead of CON3 like this: PLL(pll_1418x, CLK_FOUT_USB_PLL, "fout_usb_pll", "oscclk", PLL_LOCKTIME_PLL_USB, PLL_CON0_PLL_USB, pll_usb_rate_table), Technically the PLL should work fine with pll0822x code if the PLL tables are correct, but it's more "correct" to actually update the mask. Signed-off-by: David Virag --- drivers/clk/samsung/clk-pll.c | 20 ++++++++++++++++---- drivers/clk/samsung/clk-pll.h | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/clk/samsung/clk-pll.c b/drivers/clk/samsung/clk-pll.c index 4be879ab917e..c61a2810737c 100644 --- a/drivers/clk/samsung/clk-pll.c +++ b/drivers/clk/samsung/clk-pll.c @@ -430,6 +430,9 @@ static const struct clk_ops samsung_pll36xx_clk_min_ops = { #define PLL0822X_LOCK_STAT_SHIFT (29) #define PLL0822X_ENABLE_SHIFT (31) +/* PLL1418x is similar to PLL0822x, except that MDIV is one bit smaller */ +#define PLL1418X_MDIV_MASK (0x1FF) + static unsigned long samsung_pll0822x_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) { @@ -438,7 +441,10 @@ static unsigned long samsung_pll0822x_recalc_rate(struct clk_hw *hw, u64 fvco = parent_rate; pll_con3 = readl_relaxed(pll->con_reg); - mdiv = (pll_con3 >> PLL0822X_MDIV_SHIFT) & PLL0822X_MDIV_MASK; + if (pll->type != pll_1418x) + mdiv = (pll_con3 >> PLL0822X_MDIV_SHIFT) & PLL0822X_MDIV_MASK; + else + mdiv = (pll_con3 >> PLL0822X_MDIV_SHIFT) & PLL1418X_MDIV_MASK; pdiv = (pll_con3 >> PLL0822X_PDIV_SHIFT) & PLL0822X_PDIV_MASK; sdiv = (pll_con3 >> PLL0822X_SDIV_SHIFT) & PLL0822X_SDIV_MASK; @@ -468,9 +474,14 @@ static int samsung_pll0822x_set_rate(struct clk_hw *hw, unsigned long drate, /* Change PLL PMS values */ pll_con3 = readl_relaxed(pll->con_reg); - pll_con3 &= ~((PLL0822X_MDIV_MASK << PLL0822X_MDIV_SHIFT) | - (PLL0822X_PDIV_MASK << PLL0822X_PDIV_SHIFT) | - (PLL0822X_SDIV_MASK << PLL0822X_SDIV_SHIFT)); + if (pll->type != pll_1418x) + pll_con3 &= ~((PLL0822X_MDIV_MASK << PLL0822X_MDIV_SHIFT) | + (PLL0822X_PDIV_MASK << PLL0822X_PDIV_SHIFT) | + (PLL0822X_SDIV_MASK << PLL0822X_SDIV_SHIFT)); + else + pll_con3 &= ~((PLL1418X_MDIV_MASK << PLL0822X_MDIV_SHIFT) | + (PLL0822X_PDIV_MASK << PLL0822X_PDIV_SHIFT) | + (PLL0822X_SDIV_MASK << PLL0822X_SDIV_SHIFT)); pll_con3 |= (rate->mdiv << PLL0822X_MDIV_SHIFT) | (rate->pdiv << PLL0822X_PDIV_SHIFT) | (rate->sdiv << PLL0822X_SDIV_SHIFT); @@ -1317,6 +1328,7 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx, init.ops = &samsung_pll35xx_clk_ops; break; case pll_1417x: + case pll_1418x: case pll_0818x: case pll_0822x: case pll_0516x: diff --git a/drivers/clk/samsung/clk-pll.h b/drivers/clk/samsung/clk-pll.h index ffd3d52c0dec..1efbe4c446d0 100644 --- a/drivers/clk/samsung/clk-pll.h +++ b/drivers/clk/samsung/clk-pll.h @@ -30,6 +30,7 @@ enum samsung_pll_type { pll_2650x, pll_2650xx, pll_1417x, + pll_1418x, pll_1450x, pll_1451x, pll_1452x,