From: David Virag <virag.david003@gmail.com>
To: "Vinod Koul" <vkoul@kernel.org>,
"Kishon Vijay Abraham I" <kishon@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Alim Akhtar" <alim.akhtar@samsung.com>,
"Sylwester Nawrocki" <s.nawrocki@samsung.com>,
"Chanwoo Choi" <cw00.choi@samsung.com>,
"Michael Turquette" <mturquette@baylibre.com>,
"Stephen Boyd" <sboyd@kernel.org>,
"Thinh Nguyen" <Thinh.Nguyen@synopsys.com>,
"Peter Griffin" <peter.griffin@linaro.org>,
"André Draszik" <andre.draszik@linaro.org>,
"Sam Protsenko" <semen.protsenko@linaro.org>,
"David Virag" <virag.david003@gmail.com>,
"Marek Szyprowski" <m.szyprowski@samsung.com>
Cc: linux-phy@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-clk@vger.kernel.org
Subject: [PATCH 08/13] clk: samsung: clk-pll: Add support for pll_1418x
Date: Sun, 4 Aug 2024 23:53:53 +0200 [thread overview]
Message-ID: <20240804215458.404085-9-virag.david003@gmail.com> (raw)
In-Reply-To: <20240804215458.404085-1-virag.david003@gmail.com>
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 <virag.david003@gmail.com>
---
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,
--
2.46.0
next prev parent reply other threads:[~2024-08-04 21:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-04 21:53 [PATCH 00/13] Add USB support to Exynos7885 David Virag
2024-08-04 21:53 ` [PATCH 01/13] dt-bindings: clock: exynos7885: Fix duplicated binding David Virag
2024-08-04 21:53 ` [PATCH 02/13] dt-bindings: clock: exynos7885: Add CMU_TOP PLL MUX indices David Virag
2024-08-04 21:53 ` [PATCH 03/13] dt-bindings: clock: exynos7885: Add indices for USB clocks David Virag
2024-08-04 21:53 ` [PATCH 04/13] dt-bindings: phy: samsung,usb3-drd-phy: Add Exynos7885 support David Virag
2024-08-05 5:46 ` Krzysztof Kozlowski
2024-08-04 21:53 ` [PATCH 05/13] dt-bindings: usb: samsung,exynos-dwc3: " David Virag
2024-08-05 5:47 ` Krzysztof Kozlowski
2024-08-04 21:53 ` [PATCH 06/13] clk: samsung: exynos7885: Update CLKS_NR_FSYS after bindings fix David Virag
2024-08-05 5:49 ` Krzysztof Kozlowski
2024-08-05 12:44 ` David Virag
2024-08-05 13:38 ` Krzysztof Kozlowski
2024-08-04 21:53 ` [PATCH 07/13] clk: samsung: exynos7885: Add missing MUX clocks from PLLs in CMU_TOP David Virag
2024-08-04 21:53 ` David Virag [this message]
2024-08-04 21:53 ` [PATCH 09/13] clk: samsung: exynos7885: Add USB related clocks to CMU_FSYS David Virag
2024-08-05 5:50 ` Krzysztof Kozlowski
2024-08-04 21:53 ` [PATCH 10/13] usb: dwc3: exynos: Add support for Exynos7885 David Virag
2024-08-04 21:53 ` [PATCH 11/13] phy: exynos5-usbdrd: support Exynos7885 USB PHY David Virag
2024-08-05 5:52 ` Krzysztof Kozlowski
2024-08-04 21:53 ` [PATCH 12/13] arm64: dts: exynos: Enable USB in Exynos7885 David Virag
2024-08-05 5:52 ` Krzysztof Kozlowski
2024-08-04 21:53 ` [PATCH 13/13] arm64: dts: exynos: exynos7885-jackpotlte: Enable USB support David Virag
2024-08-05 5:45 ` [PATCH 00/13] Add USB support to Exynos7885 Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240804215458.404085-9-virag.david003@gmail.com \
--to=virag.david003@gmail.com \
--cc=Thinh.Nguyen@synopsys.com \
--cc=alim.akhtar@samsung.com \
--cc=andre.draszik@linaro.org \
--cc=conor+dt@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=mturquette@baylibre.com \
--cc=peter.griffin@linaro.org \
--cc=robh@kernel.org \
--cc=s.nawrocki@samsung.com \
--cc=sboyd@kernel.org \
--cc=semen.protsenko@linaro.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox