From patchwork Thu Jan 9 21:18:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3795 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2CC6F4173F for ; Thu, 9 Jan 2025 22:19:25 +0100 (CET) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5d3bf75bbf1sf1337410a12.1 for ; Thu, 09 Jan 2025 13:19:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1736457565; cv=pass; d=google.com; s=arc-20240605; b=MUKq5F0qYNptlvj3MZUGq31r8fFNsA3hmvezB1pGuJ+wP85OfiiOmK/FZzD/eHQAdQ aYfYRVLwM4TJVKiZo88Ba5SgA8Iok+8nETKUts1dBnYJM5X9quWNi/bK+R6fiegVYud6 L+M1irq8KyhTg9owZoyw4XCUmbRwnh1YSVwwLJek5Xaq7stSYSqGMjKvWoMIOn5/mdeJ nCy8itZtPTRCD7gsZD9uNJ6zqLMAOQnmH+cykdiLEEsJ2EV3aP++cC2e9hva3bPwtLxr 9/ADoHcPd2jje4aSkFUXt82La8tvvF4J++GFcXh9uWPy/X00Wgj0dH1iAoSNjByFzyTd ENGA== 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:cc:to:from:dkim-signature; bh=J0wQfIuD63U+vBkV3+ZhJU8RQ7vtbwkK73Xn7DO+Jok=; fh=adto3IhHGbCeg2+Hk0cv8VZ4X+RFz+be+EvjxCLIzyE=; b=JmIO9Sc7aYCqnFKOrVp6gx9i6iKSsUntNVpKQ0BjWj13sqWJJt44Z+vocE6UJHL2r2 CwF4t8U36PeBfYyIE9V/82JUqsXiB3kj7WIqPZpfWTUh5b3o7MVoEsHhIDJaZRUSCx78 4ki9H3bTYN27aBMZ342sanr/uPyRXQsyWvTZkN8i05rG013SqvfVe9tXnVJbYDwbudvg MFfrCdrULahz8vGItJEynJEYH26c9fXeIuDfr8qQ6qg/GY8QlHYPH66AKNqz6Aid2yfS j3f5OsG44WkUj6nFAXEd+zPQVxyRiMP+ELWBv1wC0XPexDnHjsA13FDtNghhnSK2KOHx eCEQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FaIYTnY6; 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=1736457565; x=1737062365; 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:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=J0wQfIuD63U+vBkV3+ZhJU8RQ7vtbwkK73Xn7DO+Jok=; b=PZ4IfdszlNTvsuEpuGJ8G/Yv8e/63HQmeIQJ9XVPiIRykl0MQFbG7WmX4nYOvLFb26 F4ZVqyhlcQyFwLAqXQNVsNTovmxMihikvVLanPSFSXrCBiEtG/vVxZrYHOE/KxD1YMe/ ZqgDIt9blR87ndbko8SQtVX6w7S253ybW94T0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736457565; x=1737062365; 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:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=J0wQfIuD63U+vBkV3+ZhJU8RQ7vtbwkK73Xn7DO+Jok=; b=kAg52dmAgGT3yr4J/V4ydJCaYFgwA9HImYruT1Rj2avkPC5gkz7UROSa+YEf0Ptfvh odMgGUkjTZ4uWbR0uAvC+MT4SyoC2yEgn2GkyChMT9JBNEejYh+LxEa6l7vTc6KrQcBv E0ZhOCGwn/ocZr60JVVa9VeANOPY9QzLmoIpCmA8nRyQsJfWJDyby/DCQNfueW5mYMIe vR80q0Q1Xd2wbC39Xsg9SnHXW2JjTc6qIL3GuWlVD7Jcw527KyhV6oMB+38cAi9EB2AY iQQM4QWc+RpvfIQyItaOgXUBRkE/Yva05CDd7W1lTye0dgZlQMb9u4qSdBtME3L4wPup 6AbQ== X-Forwarded-Encrypted: i=2; AJvYcCUOzRS7FeKdzFUjVHVKwHjdZ9o58fWJND73Ttk6RQ94myeiQz/QjbHMp62En+/JS/P02FhnZJ/mlpLn1ea2@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YySW9IBVndraV2d1PEb7haVyIhKUI9eARbDKCZN8YnPxtvGvmrD InEeHe1TwH8+8GrmOam56MQTmKpxhDp1l3X3iu9FN+/adWg5zcp9/Vx5i2Po7YMGEA== X-Google-Smtp-Source: AGHT+IFRLvVh6gaVI4rcgOYDMs1aGI3EtHsFmoSxjwSHaLRFEO1nibCOwIpz4bPzZs3aJOXUtiByYA== X-Received: by 2002:a05:6402:4408:b0:5d3:eb50:4e33 with SMTP id 4fb4d7f45d1cf-5d9861d1511mr4211525a12.5.1736457564609; Thu, 09 Jan 2025 13:19:24 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a50:bb6d:0:b0:5d3:ce70:f232 with SMTP id 4fb4d7f45d1cf-5d9855ab306ls457420a12.2.-pod-prod-00-eu; Thu, 09 Jan 2025 13:19:23 -0800 (PST) X-Received: by 2002:a05:6402:518b:b0:5d0:d2b1:6831 with SMTP id 4fb4d7f45d1cf-5d98a50f99amr3621999a12.14.1736457562734; Thu, 09 Jan 2025 13:19:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736457562; cv=none; d=google.com; s=arc-20240605; b=eudJ77V1aHz65JasrpFQMHvza0FCfwM2iAdE+pxiUDhY/wmt6MIpUuvA01X92svojV KANmYFC2t6LIeOVFMUCE2x1Q1drYAxBlagPTbOvPpr6stakWzbIlXHaWPQDOEFe0WbuC kgMp7Y8tXz7U45GqzESmsgKdXMserYd3buIpZb3MyB/S3gVu+cjU25lnnn74Mmrthyno 58Q8kOY4fB1FGnGcwjQmARfw0FW72G17KEg45viPu5Wz0/KZuP7xZBXMxX4JH9wNAWCy dbH1l0lNEIWkH2lT2tiYu2Fn5B6doLRVmnxiob/7aTgufVvv8QPiZhMOCNuY3VCHyXoj oUng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=iJ26hgnRMCLZPTXr7KLkVyqRMMqeBIF3e9Y1qTU0tFU=; fh=LKhgYKqW/DH7bOgdnVELRgL+gR1eISg3bEXUN1rI9pA=; b=YkjlS5muyxhPPofit/dWId9Y1s80g2EW6dvimdPM0/tpoP2OcjKKqwnD7OAfHQo2I1 GDC3IvUgY5n9r/DF6Asxm+KBtzwoH9eC8Z6o9OpS45+AUmuS8vDkfWQWf+JiL0K17mep 55awlhbhpfnHgvknkFn2OEGfRXfa5tyfUb6Hi1eO9AJB5Qv7cp9+cj/qy/5zTeUHCey1 JG1JLvhhI4XA08I0Uu0Qf0yb6ON7LZFqxiYg4gE3i2LHGLtlT8LNbDgplQja9DkQ245Z jWYtKYKQLsax3UFvi+qSr9HUkZNA7uVCEVjWDJ8vObDokqRr8pKDxq/yDa0YR6Ogw7mf ujXg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=FaIYTnY6; 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 4fb4d7f45d1cf-5d990442605sor989588a12.4.2025.01.09.13.19.22 for (Google Transport Security); Thu, 09 Jan 2025 13:19:22 -0800 (PST) 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-Gm-Gg: ASbGncshPHNjr/XsH4/tRcat6M7C2vDqbeafHUhKf7kYVOrtxEMIpczSQWfp+gJPFuR ZOA/7UQX8QMmu1jHG2mjQUea+oBMuAQK6S6QqpVp7Y6kwGmnZb0Bgz5CoPKlWPBos0UHa0Lo5Vt 3Oz7/BJTU6SpCAaNWqEuf1yVZcalsY+B+it49TjiuyPagwsrXInI3WZf47JTYelleE4CSP++4DG ozLVi0AxG8bkL2MudLrAaNjN+REjrj2c6pl4sTUY2iVUVcODuPBP0XKH8BDtkWEOh8g3CH/dm+K UlzKnTxdabxYR1RB2kSreHl8G6WMP8OhgTSC10IEe1IEaUVxfkHap3G6UerH2N6dXWGk/BwE95e UaGZKJgptUm86sIxelA== X-Received: by 2002:a05:6402:40cc:b0:5d0:d328:3a43 with SMTP id 4fb4d7f45d1cf-5d98a24a72fmr3294628a12.6.1736457562307; Thu, 09 Jan 2025 13:19:22 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-41-6-15.retail.telecomitalia.it. [79.41.6.15]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d9900c4b56sm925567a12.32.2025.01.09.13.19.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 13:19:22 -0800 (PST) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Alexandre Torgue , Maxime Coquelin , Michael Turquette , Stephen Boyd , linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH v2 4/4] clk: stm32f4: support spread spectrum clock generation Date: Thu, 9 Jan 2025 22:18:31 +0100 Message-ID: <20250109211908.1553072-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250109211908.1553072-1-dario.binacchi@amarulasolutions.com> References: <20250109211908.1553072-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=FaIYTnY6; 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: , Support spread spectrum clock generation for the main PLL, the only one for which this functionality is available. Tested on the STM32F469I-DISCO board. Signed-off-by: Dario Binacchi --- Changes in v2: - Fixup patches: 2/6 dt-bindings: reset: st,stm32-rcc: update reference due to rename 3/6 dt-bindings: clock: stm32fx: update reference due to rename to 1/6 dt-bindings: clock: convert stm32 rcc bindings to json-schema - Changes to dt-bindings: clock: convert stm32 rcc bindings to json-schema - Changes to dt-bindings: clock: st,stm32-rcc: support spread spectrum clocking drivers/clk/clk-stm32f4.c | 143 +++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c index db1c56c8d54f..6c80c0dbb0a3 100644 --- a/drivers/clk/clk-stm32f4.c +++ b/drivers/clk/clk-stm32f4.c @@ -35,6 +35,7 @@ #define STM32F4_RCC_APB2ENR 0x44 #define STM32F4_RCC_BDCR 0x70 #define STM32F4_RCC_CSR 0x74 +#define STM32F4_RCC_SSCGR 0x80 #define STM32F4_RCC_PLLI2SCFGR 0x84 #define STM32F4_RCC_PLLSAICFGR 0x88 #define STM32F4_RCC_DCKCFGR 0x8c @@ -42,6 +43,12 @@ #define STM32F4_RCC_PLLCFGR_N_MASK GENMASK(14, 6) +#define STM32F4_RCC_SSCGR_SSCGEN BIT(31) +#define STM32F4_RCC_SSCGR_SPREADSEL BIT(30) +#define STM32F4_RCC_SSCGR_RESERVED_MASK GENMASK(29, 28) +#define STM32F4_RCC_SSCGR_INCSTEP_MASK GENMASK(27, 13) +#define STM32F4_RCC_SSCGR_MODPER_MASK GENMASK(12, 0) + #define NONE -1 #define NO_IDX NONE #define NO_MUX NONE @@ -512,6 +519,17 @@ static const struct clk_div_table pll_divr_table[] = { { 2, 2 }, { 3, 3 }, { 4, 4 }, { 5, 5 }, { 6, 6 }, { 7, 7 }, { 0 } }; +enum stm32f4_pll_ssc_mod_type { + STM32F4_PLL_SSC_CENTER_SPREAD, + STM32F4_PLL_SSC_DOWN_SPREAD, +}; + +struct stm32f4_pll_ssc { + unsigned int mod_freq; + unsigned int mod_depth; + enum stm32f4_pll_ssc_mod_type mod_type; +}; + struct stm32f4_pll { spinlock_t *lock; struct clk_gate gate; @@ -519,6 +537,8 @@ struct stm32f4_pll { u8 bit_rdy_idx; u8 status; u8 n_start; + bool ssc_enable; + struct stm32f4_pll_ssc ssc_conf; }; #define to_stm32f4_pll(_gate) container_of(_gate, struct stm32f4_pll, gate) @@ -541,6 +561,7 @@ struct stm32f4_vco_data { u8 offset; u8 bit_idx; u8 bit_rdy_idx; + bool sscg; }; static const struct stm32f4_vco_data vco_data[] = { @@ -661,6 +682,34 @@ static long stm32f4_pll_round_rate(struct clk_hw *hw, unsigned long rate, return *prate * n; } +static void stm32f4_pll_set_ssc(struct clk_hw *hw, unsigned long parent_rate, + unsigned int ndiv) +{ + struct clk_gate *gate = to_clk_gate(hw); + struct stm32f4_pll *pll = to_stm32f4_pll(gate); + struct stm32f4_pll_ssc *ssc = &pll->ssc_conf; + u32 modeper, incstep; + u32 sscgr; + + sscgr = readl(base + STM32F4_RCC_SSCGR); + /* reserved field must be kept at reset value */ + sscgr &= STM32F4_RCC_SSCGR_RESERVED_MASK; + + modeper = DIV_ROUND_CLOSEST(parent_rate, 4 * ssc->mod_freq); + incstep = DIV_ROUND_CLOSEST(((1 << 15) - 1) * ssc->mod_depth * ndiv, + 5 * 10000 * modeper); + sscgr |= STM32F4_RCC_SSCGR_SSCGEN | + FIELD_PREP(STM32F4_RCC_SSCGR_INCSTEP_MASK, incstep) | + FIELD_PREP(STM32F4_RCC_SSCGR_MODPER_MASK, modeper); + + if (ssc->mod_type) + sscgr |= STM32F4_RCC_SSCGR_SPREADSEL; + + pr_debug("%s: pll: %s: modeper: %d, incstep: %d, sscgr: 0x%08x\n", + __func__, clk_hw_get_name(hw), modeper, incstep, sscgr); + writel(sscgr, base + STM32F4_RCC_SSCGR); +} + static int stm32f4_pll_set_rate(struct clk_hw *hw, unsigned long rate, unsigned long parent_rate) { @@ -683,6 +732,9 @@ static int stm32f4_pll_set_rate(struct clk_hw *hw, unsigned long rate, writel(val, base + pll->offset); + if (pll->ssc_enable) + stm32f4_pll_set_ssc(hw, parent_rate, n); + if (pll_state) stm32f4_pll_enable(hw); @@ -788,6 +840,87 @@ static struct clk_hw *clk_register_pll_div(const char *name, return hw; } +static int stm32f4_pll_init_ssc(struct clk_hw *hw, struct stm32f4_pll_ssc *conf) +{ + struct clk_gate *gate = to_clk_gate(hw); + struct stm32f4_pll *pll = to_stm32f4_pll(gate); + struct clk_hw *parent; + unsigned long parent_rate; + int pll_state; + unsigned long n, val; + + parent = clk_hw_get_parent(hw); + if (!parent) { + pr_err("%s: failed to get clock parent\n", __func__); + return -ENODEV; + } + + parent_rate = clk_hw_get_rate(parent); + + pll->ssc_enable = true; + memcpy(&pll->ssc_conf, conf, sizeof(pll->ssc_conf)); + + pll_state = stm32f4_pll_is_enabled(hw); + + if (pll_state) + stm32f4_pll_disable(hw); + + val = readl(base + pll->offset); + n = FIELD_GET(STM32F4_RCC_PLLCFGR_N_MASK, val); + + pr_debug("%s: pll: %s, parent: %s, parent-rate: %lu, n: %lu\n", + __func__, clk_hw_get_name(hw), clk_hw_get_name(parent), + parent_rate, n); + + stm32f4_pll_set_ssc(hw, parent_rate, n); + + if (pll_state) + stm32f4_pll_enable(hw); + + return 0; +} + +static int stm32f4_pll_ssc_parse_dt(struct device_node *np, + struct stm32f4_pll_ssc *conf) +{ + int ret; + const char *s; + + if (!conf) + return -EINVAL; + + ret = of_property_read_u32(np, "st,ssc-modfreq-hz", &conf->mod_freq); + if (ret) + return ret; + + ret = of_property_read_u32(np, "st,ssc-moddepth-permyriad", + &conf->mod_depth); + if (ret) { + pr_err("%pOF: missing st,ssc-moddepth-permyriad\n", np); + return ret; + } + + ret = of_property_read_string(np, "st,ssc-modmethod", &s); + if (ret) { + pr_err("%pOF: missing st,ssc-modmethod\n", np); + return ret; + } + + if (!strcmp(s, "down-spread")) { + conf->mod_type = STM32F4_PLL_SSC_DOWN_SPREAD; + } else if (!strcmp(s, "center-spread")) { + conf->mod_type = STM32F4_PLL_SSC_CENTER_SPREAD; + } else { + pr_err("%pOF: wrong value (%s) for fsl,ssc-modmethod\n", np, s); + return -EINVAL; + } + + pr_debug("%pOF: SSCG settings: mod_freq: %d, mod_depth: %d mod_method: %s [%d]\n", + np, conf->mod_freq, conf->mod_depth, s, conf->mod_type); + + return 0; +} + static struct clk_hw *stm32f4_rcc_register_pll(const char *pllsrc, const struct stm32f4_pll_data *data, spinlock_t *lock) { @@ -1695,7 +1828,8 @@ static void __init stm32f4_rcc_init(struct device_node *np) const struct of_device_id *match; const struct stm32f4_clk_data *data; unsigned long pllm; - struct clk_hw *pll_src_hw; + struct clk_hw *pll_src_hw, *pll_vco_hw; + struct stm32f4_pll_ssc ssc_conf; base = of_iomap(np, 0); if (!base) { @@ -1754,8 +1888,8 @@ static void __init stm32f4_rcc_init(struct device_node *np) clk_hw_register_fixed_factor(NULL, "vco_in", pll_src, 0, 1, pllm); - stm32f4_rcc_register_pll("vco_in", &data->pll_data[0], - &stm32f4_clk_lock); + pll_vco_hw = stm32f4_rcc_register_pll("vco_in", &data->pll_data[0], + &stm32f4_clk_lock); clks[PLL_VCO_I2S] = stm32f4_rcc_register_pll("vco_in", &data->pll_data[1], &stm32f4_clk_lock); @@ -1900,6 +2034,9 @@ static void __init stm32f4_rcc_init(struct device_node *np) of_clk_add_hw_provider(np, stm32f4_rcc_lookup_clk, NULL); + if (!stm32f4_pll_ssc_parse_dt(np, &ssc_conf)) + stm32f4_pll_init_ssc(pll_vco_hw, &ssc_conf); + return; fail: kfree(clks);