From patchwork Thu Sep 26 10:48:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3522 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4AC523FA4C for ; Thu, 26 Sep 2024 12:49:02 +0200 (CEST) Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-42cb6dc3365sf5781225e9.2 for ; Thu, 26 Sep 2024 03:49:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727347742; cv=pass; d=google.com; s=arc-20240605; b=GJFPgS4FD4b9/87Fk9Uv6Yn/W5yN0u7i3pYWWc/jSQrCMXXNJ8jpLgi2vfC+DilK7n YIAuOv5b3UQ0NlOzbWIk6qByXezzEXgNyDUFOVL4VSKC2jFrmEkRAIoSc/K5PQZ9eyXR 7Va//vA56QC7ahOEp7XQl359CQTErt1XGYnqcp5kYnmo8ke1UAaRRkmkKEJQEDm1wV1H cyd3q+T76ApF+jmm2SYUUjZ8MlVco+EHpZAJeW7DQud6E4U6Hg82I/P0ejIaJdKE049C 3nBQYs7wmDBZQmFTAxsOD95nc/iwUw0BHxrV3Sgn5+KeT0khxnkXKJg58EMlexFet6cv 3MeQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=R8keFJkM09Shp3yIumCQnXaysOStg3Cn1bxnwWLdejA=; fh=uCMsz/MoD/lEcAZYxud1ghI8806lteg5xZuWxqbBBsQ=; b=B9DNpP/1pnBX7dQ24J9xCewqAplsNg9jdAzVixwjpBvLHZpCEQjeNFAUtmZ96PphQw g9i5kfRn4n0mFZLQ8fzomcw+KiLAMdrAEx1VUE0YT1v1KQ5L0ef4FF9FNIWxUlmiy4Kw blb3ToEx9wVD7ayqcPN6Gm0CxbQ3qRHLEK3Alg+MnOpiV69lZJOrU1CmeWoyp80jWV++ y/QvMyoeJVlSdKfrux1YpoJzCAfoSbSNY/j+psUMluEC1fZrV1F2Jc1fv2WnhICCR3h5 tCTyStASVCYMgh2Jro4GBbbe04tHu1hqkfDDQGbN1SdOU2qPUIQa/odkJj1evtjOEux9 vORQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AEtXsSAT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1727347742; x=1727952542; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=R8keFJkM09Shp3yIumCQnXaysOStg3Cn1bxnwWLdejA=; b=Ccx4d9n0ouN8ntKfWWcvRf1FrzVS5zeN2Q+Arspsi3OFMxOrMYXAo1LwuOjPXWlwrq 6PgFlmjNplFVLYacAwSf90+DB6uto24VcIP6Fia43rvDvRzZEoeoOtUX1Z6REJ/CiSda 1xSA3eqVrOLmrS6pt1ZUHxqsbRyMmxxYLUt60= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727347742; x=1727952542; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R8keFJkM09Shp3yIumCQnXaysOStg3Cn1bxnwWLdejA=; b=JjupMdlkhfH4pnKUFQ3MxTgM3apsrRLsQIw1bGF5GPNLo65bs+nhvFWIL6g9/lskFV m5TKdd2yDW91ydXTSf0AdHUaAyd7o5q8BRQbTFVxai4pcK/9a5RqOiYd61f9BklDz80e /RHKnUsya+WUnJfvIWI4oJQaBdDXB9ubyVRec2lXwZniijkHqO6t7KBcbxNvEHF58YDX JJGe5dgv7Ji74hJZCCapkPsC3HPbhjiBDALcB6KPVB3ZyWlyTJ+Huz/RaRxDGs9By3qP Z1adto039vh64gk3w21DVzGcJ1u8aEVrnsMi0fN3DrbXPCWobjmuoIl0PnfOE/bLxQ41 14LQ== X-Forwarded-Encrypted: i=2; AJvYcCWgWdaTu612j9YAe5+boLuZqm4Iilfhrxz5w82y/b0hJIEi3aUhtiEPHJxMU+aIn8duA+D0DOp4sWPez2OJ@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwAZtfQJpnELO87POZuTNAEid7cQYSPnW8RhK3bbzrp5z851kiX piLfHywXptMfKNvrvUWDuPMo+WAAmwFeR8TlDrB2o6eRFWnHaWV6as9u6eR9oeFAuQ== X-Google-Smtp-Source: AGHT+IFgv8cJDhLvXU5+JkgIeE3PsKaN3QoACfjSnnvm5nJs5vWFcl9VeKpV+WWXJHguqlrdwCs1bQ== X-Received: by 2002:a05:600c:4ecd:b0:426:6455:f124 with SMTP id 5b1f17b1804b1-42e960af41bmr49100155e9.0.1727347741714; Thu, 26 Sep 2024 03:49:01 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:600c:3b89:b0:42c:af5b:facc with SMTP id 5b1f17b1804b1-42f522289fbls2442545e9.1.-pod-prod-07-eu; Thu, 26 Sep 2024 03:49:00 -0700 (PDT) X-Received: by 2002:a05:600c:45c9:b0:42c:b942:1bba with SMTP id 5b1f17b1804b1-42e96144c66mr40459525e9.27.1727347740120; Thu, 26 Sep 2024 03:49:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727347740; cv=none; d=google.com; s=arc-20160816; b=p9QiEoPn4QKHqzktKwkQW/fmjFEhyB+X0d3pBm1t0wYLsihbigxR9BHeMLpUkbg8TV yCjJfzlgbVk//vcfR/1B6Dl8dFTMBD0VCtSOSx5TOBR60jk9pJ6+f1FKlaJIAOj9IkGn KgDjgTRbEcuKA3ZLlVSHJhsiYV+KTlzKBt/Db7d3jg3y+TO/5r0+ERe6giFnvymJOPm9 dFl8anoqdgFN8RiLgQXbt0zDRtdVbUNWJIm6KMpLygP7BJH+VL6ok7n/w7QmUFHf1KnD fI6FTFTxVEp5z58BEG+VS3wmEqLXqCPv5UU+QAk7HdtIRIJbwCfl7dwrFe8hHoL23Ubq ZeNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=k379zOY8JpOCRdB0yzVh9VgxfCdVDSaVvSc2yhV6i0U=; fh=FtQepR0uNoeKT2PVdKfTKOkvEYfwbRmoVE9BmlYw3tk=; b=0XAABMAd80wDB7i6Ce3EFzY2Bk2roOLbGYJsn7QXJ0TlT04o4Q/zH1ZbVfs8/z56hL 626D23owPYI3M3oEp1dlCPiODnDhlO3eM2jXwrfDpP1PKxkqhgFCLtyOzTNUlECw2p28 wYZVTseml9lIJX243fAAK2W/emGl881Cu22FmCyyVmAwJsBy7fipIDfFGsMTKDz53+Ym DSCmhKG0W1AQ+V+sUT6N8DALGfGkIxLklGlZHo9omHEqxAjip/XmuWswlu12bR1rWxnC kou4taz27b0b6hcfV7PXB+7axZbMjnpg9nPwYJH/AiMZGNb6YdWt4jLNJEejl70LbmZp JVcA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AEtXsSAT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-42e906cf171sor26009945e9.13.2024.09.26.03.49.00 for (Google Transport Security); Thu, 26 Sep 2024 03:49:00 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Received: by 2002:adf:fe06:0:b0:37c:cd57:d92f with SMTP id ffacd0b85a97d-37ccd57d9c3mr2062607f8f.3.1727347739289; Thu, 26 Sep 2024 03:48:59 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.42.126]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e96a55336sm43314755e9.47.2024.09.26.03.48.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2024 03:48:58 -0700 (PDT) From: Dario Binacchi To: linux-amarula@amarulasolutions.com Subject: [PATCH 2/6] clk: imx: pll14xx: support spread spectrum clock generation Date: Thu, 26 Sep 2024 12:48:51 +0200 Message-ID: <20240926104855.656121-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240926104855.656121-1-dario.binacchi@amarulasolutions.com> References: <20240926104855.656121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=AEtXsSAT; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds support for spread spectrum clock (SSC) generation for the pll14xxx. The addition of the "imx_clk_hw_pll14xx_ssc" macro has minimized the number of changes required to avoid compilation errors following the addition of the SSC setup parameter to the "imx_dev_clk_hw_pll14xx" macro used in the files clk-imx8m{m,n,p}.c. The change to the clk-imx8mp-audiomix.c file prevents the patch from causing a compilation error. Signed-off-by: Dario Binacchi --- drivers/clk/imx/clk-imx8mp-audiomix.c | 2 +- drivers/clk/imx/clk-pll14xx.c | 102 +++++++++++++++++++++++++- drivers/clk/imx/clk.h | 24 +++++- 3 files changed, 124 insertions(+), 4 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c index b2cb157703c5..bfcf2975c217 100644 --- a/drivers/clk/imx/clk-imx8mp-audiomix.c +++ b/drivers/clk/imx/clk-imx8mp-audiomix.c @@ -365,7 +365,7 @@ static int clk_imx8mp_audiomix_probe(struct platform_device *pdev) clk_hw_data->hws[IMX8MP_CLK_AUDIOMIX_SAI_PLL_REF_SEL] = hw; hw = imx_dev_clk_hw_pll14xx(dev, "sai_pll", "sai_pll_ref_sel", - base + 0x400, &imx_1443x_pll); + base + 0x400, &imx_1443x_pll, NULL); if (IS_ERR(hw)) { ret = PTR_ERR(hw); goto err_clk_register; diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c index d63564dbb12c..76014e243a57 100644 --- a/drivers/clk/imx/clk-pll14xx.c +++ b/drivers/clk/imx/clk-pll14xx.c @@ -20,6 +20,8 @@ #define GNRL_CTL 0x0 #define DIV_CTL0 0x4 #define DIV_CTL1 0x8 +#define SSCG_CTRL 0xc + #define LOCK_STATUS BIT(31) #define LOCK_SEL_MASK BIT(29) #define CLKE_MASK BIT(11) @@ -31,6 +33,10 @@ #define KDIV_MASK GENMASK(15, 0) #define KDIV_MIN SHRT_MIN #define KDIV_MAX SHRT_MAX +#define SSCG_ENABLE BIT(31) +#define MFREQ_CTL_MASK GENMASK(19, 12) +#define MRAT_CTL_MASK GENMASK(9, 4) +#define SEL_PF_MASK GENMASK(1, 0) #define LOCK_TIMEOUT_US 10000 @@ -40,6 +46,7 @@ struct clk_pll14xx { enum imx_pll14xx_type type; const struct imx_pll14xx_rate_table *rate_table; int rate_count; + struct imx_pll14xx_ssc ssc; }; #define to_clk_pll14xx(_hw) container_of(_hw, struct clk_pll14xx, hw) @@ -347,6 +354,27 @@ static int clk_pll1416x_set_rate(struct clk_hw *hw, unsigned long drate, return 0; } +static void clk_pll1443x_set_sscg(struct clk_hw *hw, unsigned long parent_rate, + unsigned int pdiv, unsigned int mdiv) +{ + struct clk_pll14xx *pll = to_clk_pll14xx(hw); + struct imx_pll14xx_ssc *ssc = &pll->ssc; + u32 sscg_ctrl = readl_relaxed(pll->base + SSCG_CTRL); + + sscg_ctrl &= + ~(SSCG_ENABLE | MFREQ_CTL_MASK | MRAT_CTL_MASK | SEL_PF_MASK); + if (ssc->enable) { + u32 mfr = parent_rate / (ssc->mod_freq * pdiv * (1 << 5)); + u32 mrr = (ssc->mod_rate * mdiv * (1 << 6)) / (100 * mfr); + + sscg_ctrl |= SSCG_ENABLE | FIELD_PREP(MFREQ_CTL_MASK, mfr) | + FIELD_PREP(MRAT_CTL_MASK, mrr) | + FIELD_PREP(SEL_PF_MASK, ssc->mod_type); + } + + writel_relaxed(sscg_ctrl, pll->base + SSCG_CTRL); +} + static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate, unsigned long prate) { @@ -368,6 +396,9 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate, writel_relaxed(FIELD_PREP(KDIV_MASK, rate.kdiv), pll->base + DIV_CTL1); + if (pll->ssc.enable) + clk_pll1443x_set_sscg(hw, prate, rate.pdiv, rate.mdiv); + return 0; } @@ -408,6 +439,9 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate, gnrl_ctl &= ~BYPASS_MASK; writel_relaxed(gnrl_ctl, pll->base + GNRL_CTL); + if (pll->ssc.enable) + clk_pll1443x_set_sscg(hw, prate, rate.pdiv, rate.mdiv); + return 0; } @@ -487,7 +521,8 @@ static const struct clk_ops clk_pll1443x_ops = { struct clk_hw *imx_dev_clk_hw_pll14xx(struct device *dev, const char *name, const char *parent_name, void __iomem *base, - const struct imx_pll14xx_clk *pll_clk) + const struct imx_pll14xx_clk *pll_clk, + const struct imx_pll14xx_ssc *ssc) { struct clk_pll14xx *pll; struct clk_hw *hw; @@ -525,6 +560,8 @@ struct clk_hw *imx_dev_clk_hw_pll14xx(struct device *dev, const char *name, pll->type = pll_clk->type; pll->rate_table = pll_clk->rate_table; pll->rate_count = pll_clk->rate_count; + if (ssc) + memcpy(&pll->ssc, ssc, sizeof(pll->ssc)); val = readl_relaxed(pll->base + GNRL_CTL); val &= ~BYPASS_MASK; @@ -542,3 +579,66 @@ struct clk_hw *imx_dev_clk_hw_pll14xx(struct device *dev, const char *name, return hw; } EXPORT_SYMBOL_GPL(imx_dev_clk_hw_pll14xx); + +static enum imx_pll14xx_ssc_mod_type clk_pll14xx_ssc_mode(const char *name, + enum imx_pll14xx_ssc_mod_type def) +{ + int i; + struct { + const char *name; + enum imx_pll14xx_ssc_mod_type id; + } mod_methods[] = { + { .name = "down-spread", .id = IMX_PLL14XX_SSC_DOWN_SPREAD }, + { .name = "up-spread", .id = IMX_PLL14XX_SSC_UP_SPREAD }, + { .name = "center-spread", .id = IMX_PLL14XX_SSC_CENTER_SPREAD } + }; + + for (i = 0; i < ARRAY_SIZE(mod_methods); i++) { + if (!strcmp(name, mod_methods[i].name)) + return mod_methods[i].id; + } + + return def; +} + +void imx_clk_pll14xx_get_ssc_conf(struct device_node *np, int pll_id, + struct imx_pll14xx_ssc *ssc) +{ + int i, ret, offset, num_clks; + u32 clk_id, clk_cell_size; + const char *s; + + if (!ssc) + return; + + memset(ssc, 0, sizeof(*ssc)); + + num_clks = of_count_phandle_with_args(np, "fsl,ssc-clocks", + "#clock-cells"); + if (num_clks <= 0) + return; + + ret = of_property_read_u32(np, "#clock-cells", &clk_cell_size); + if (ret) + return; + + for (i = 0; i < num_clks; i++) { + offset = i * clk_cell_size + 1; + of_property_read_u32_index(np, "fsl,ssc-clocks", offset, + &clk_id); + if (clk_id != pll_id) + continue; + + of_property_read_u32_index(np, "fsl,ssc-modfreq-hz", i, + &ssc->mod_freq); + of_property_read_u32_index(np, "fsl,ssc-modrate-percent", i, + &ssc->mod_rate); + if (!of_property_read_string(np, "fsl,ssc-modmethod", &s)) + ssc->mod_type = clk_pll14xx_ssc_mode( + s, IMX_PLL14XX_SSC_DOWN_SPREAD); + + ssc->enable = true; + break; + } +} +EXPORT_SYMBOL_GPL(imx_clk_pll14xx_get_ssc_conf); diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h index aa5202f284f3..8cbc75480569 100644 --- a/drivers/clk/imx/clk.h +++ b/drivers/clk/imx/clk.h @@ -62,6 +62,19 @@ struct imx_pll14xx_rate_table { unsigned int kdiv; }; +enum imx_pll14xx_ssc_mod_type { + IMX_PLL14XX_SSC_DOWN_SPREAD, + IMX_PLL14XX_SSC_UP_SPREAD, + IMX_PLL14XX_SSC_CENTER_SPREAD, +}; + +struct imx_pll14xx_ssc { + bool enable; + unsigned int mod_freq; + unsigned int mod_rate; + enum imx_pll14xx_ssc_mod_type mod_type; +}; + struct imx_pll14xx_clk { enum imx_pll14xx_type type; const struct imx_pll14xx_rate_table *rate_table; @@ -222,11 +235,18 @@ extern struct imx_fracn_gppll_clk imx_fracn_gppll_integer; __imx_clk_hw_divider(name, parent, reg, shift, width, flags) #define imx_clk_hw_pll14xx(name, parent_name, base, pll_clk) \ - imx_dev_clk_hw_pll14xx(NULL, name, parent_name, base, pll_clk) + imx_dev_clk_hw_pll14xx(NULL, name, parent_name, base, pll_clk, NULL) + +#define imx_clk_hw_pll14xx_ssc(name, parent_name, base, pll_clk, ssc) \ + imx_dev_clk_hw_pll14xx(NULL, name, parent_name, base, pll_clk, ssc) struct clk_hw *imx_dev_clk_hw_pll14xx(struct device *dev, const char *name, const char *parent_name, void __iomem *base, - const struct imx_pll14xx_clk *pll_clk); + const struct imx_pll14xx_clk *pll_clk, + const struct imx_pll14xx_ssc *ssc); + +void imx_clk_pll14xx_get_ssc_conf(struct device_node *np, int pll_id, + struct imx_pll14xx_ssc *ssc); struct clk_hw *imx_clk_hw_pllv1(enum imx_pllv1_type type, const char *name, const char *parent, void __iomem *base);