From nobody Sat Apr 25 11:50:57 2026 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 631572F25F5 for ; Thu, 23 Apr 2026 13:50:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776952260; cv=none; b=X1fz4SMp5YNvSmT+YylmnVvzDx6IHvShggYSS3rcdDtAvh/25ThA4lqF31uvHJ7sC2Z/TsEB+d4MFyE5udTjhV9aHgbSa7kG0oPjPrAxm/oS+fMSHvFSSN36ESTYa5P1FfRR3l8KzzeoRXhuJ4llYz10efFFMAN8vgsTIETPL2Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776952260; c=relaxed/simple; bh=rJwxxdAHYTOkwC6ejBPFSKCPExyZshmx+fdptqSaa6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J97r5lUy9Yqid9ay1AffdWZ5tS16gtNQcUBEFgEYHJU5eMzRjEWW6pGoEyy9bjWbIuuTB2r1vF4uhbpbEK3RfDApR0AaIhTbHQ6sQo9uBojas1I7cSAFYBzfWfo0poMseFHXrLcEGw9uWJvWD1xzCDn76L86/mjamR4DX+24PLM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VbO5NOZa; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VbO5NOZa" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-48896199cbaso66112195e9.1 for ; Thu, 23 Apr 2026 06:50:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776952255; x=1777557055; darn=vger.kernel.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=UV076pPTBI35+Ifj/9Qen6QjnrSg3SZMeVHb6HNEkR8=; b=VbO5NOZa963JsQepImqgBBnZCI68GuO02nY0FbKbXrnyV3Iy3ppH/f75oT8gUo/aNK 8Ivc1L7l/E285yBC0ZrpQLJSwPCF7TX2FkSqwi5hf+jzSip1Nbvi4SbeglGXS3QwKvaJ RUQggtSNlmyJyp2kJAMzU6bNuuI7oj3WYFaU1hOIdo/ianDjGvNKAmI1yxXfGkoo22/6 YvBa1jeqNi2dZYXlKI+ZBrGaF0YIvE3T3BB8xH2Bc3ASNERO448eMzvttq4ar4MDyX4f 6aj3v8wVx2Mb2z/Nqqnp/NyR3jz5vs6Lau8aDSdeI8/u3rIoKcWezcdRKG/YQHJZhcwV zKnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952255; x=1777557055; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UV076pPTBI35+Ifj/9Qen6QjnrSg3SZMeVHb6HNEkR8=; b=WIW0BZyaj/r3gXwYsmutscoVubAdmX57qW2mNw4UAobOnU3N7smpQ1vhfyc3/h6ZNj baLegGuCkDzAoh/yUhakEo9dAg89cSFW1zLVe9Ad7KaNQ3uUrPveNktBEhcHKDcmYy60 nZtuC7k3L7bNfdb5pLOtM19J3GZOVsH05EXPYrG1eGGPO9mBBucsxHzKNg/w5yNijbKN PM4NTt1sqg1tg8mJhsoWG5jCPXl4LmYf2SBUSCQFIS2d0H6I5qFwkcZN4NDtmHdpZTZW Dd76vrViStLEUD0Z49gZ6swu0mjsqJU2ZkATHVqHy/3guSOB+RF9loYnQ4HGMl29w19G IeTw== X-Forwarded-Encrypted: i=1; AFNElJ/sge5l2KrpClIpZxkDu6JEZOH8SjsusKKfE4CITpI63gIVNZx/RHXyZ0O0vRUl7cSSKxJK/F8kNC25yGw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx0DX2tMCGhxuxxHaqEgH/G8z2nS/K7n0hygj+Ob2YCwMVgw5iR yucTSMkXRRts7mDvadj/7q5QWH1fbWk3lFJ+20Rmav3qpEP52qcoGFfs X-Gm-Gg: AeBDietP4mjlft9UvpLy6pVIx9qqKgjdjH6RMvQ7lpubkQ7wSUQn+7ygWb/l4jbkE0S 23Jg3KtCz/N69CJMnVPQPrz4pInOsC/8obgD9K+d8x6NNi8i8YbCJY8IS83MWpD4htI0hPXeR8U rFc4QcgGiIB5cR/njMqj2GJHajC7TRnpykWLourJXPDS9zwRAgbfh55eIKSyNqLMsy0RSFEItck 2ZUpa6A17/cLfCX+bLDmdy8bNQFqnni/EtqA4ghl1oDY0AJis9i6C3x9PNuSfgmazac2TiGwhsb Dk4eZP96ClgiNY+RaHEORl4iYPI5LOB8J5Q/Vs5T+HbOvMu5Oi069KwNKG6o18qFCiJQK4XL36t KJ5zww8VeaJS4AckQOc8HtUQe2dkKvagPzrj/LVWeBHm9CNAetbctMQ22nZ3ckIVXZHoBraNVXa ydhAwlT2U14plaFXcUlYIqQxSOpweY1M7EtRXfgUFGCxcnKWgF4xOVxqGNeU4= X-Received: by 2002:a05:600c:c0d5:b0:488:c683:be89 with SMTP id 5b1f17b1804b1-488fb74dffemr301364445e9.9.1776952255226; Thu, 23 Apr 2026 06:50:55 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:c2c5:eec8:9509:382e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a52583fe7sm228134335e9.13.2026.04.23.06.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 06:50:54 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd Cc: Biju Das , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v6 1/3] clk: renesas: rzg2l: Add support for enabling PLLs Date: Thu, 23 Apr 2026 14:50:45 +0100 Message-ID: <20260423135050.238400-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423135050.238400-1-biju.das.jz@bp.renesas.com> References: <20260423135050.238400-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Add support for enabling PLL clocks in the RZ/G3L CPG driver to turn off some PLLs, if they are not in use(eg: PLL6, PLL7) Introduce `is_enabled` and `enable` callbacks to handle PLL state transitions. With the `enable` callback, PLL will be turned ON only when the PLL consumer device is enabled; otherwise, it will remain off. Define new macros for PLL standby and monitor registers to facilitate this process. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven --- v5->v6: * Fixed the typo in comment stanby->standby. * Collected the tag. v4->v5: * Rebased to initial boot series. v3->v4: * No change v2->v3: * No change v1->v2: * No change --- drivers/clk/renesas/rzg2l-cpg.c | 67 +++++++++++++++++++++++++++++++++ drivers/clk/renesas/rzg2l-cpg.h | 4 ++ 2 files changed, 71 insertions(+) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cp= g.c index 910c16a369a5..f98b6eb4f501 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -58,6 +58,13 @@ #define RZG3S_DIV_NF GENMASK(12, 1) #define RZG3S_SEL_PLL BIT(0) =20 +#define RZG3L_PLL_STBY_OFFSET(x) (GET_REG_SAMPLL_CLK1(x) - 0x4) +#define RZG3L_PLL_STBY_RESETB BIT(0) +#define RZG3L_PLL_STBY_RESETB_WEN BIT(16) +#define RZG3L_PLL_MON_OFFSET(x) (GET_REG_SAMPLL_CLK1(x) + 0x8) +#define RZG3L_PLL_MON_RESETB BIT(0) +#define RZG3L_PLL_MON_LOCK BIT(4) + #define CLK_ON_R(reg) (reg) #define CLK_MON_R(reg) (0x180 + (reg)) #define CLK_RST_R(reg) (reg) @@ -1175,6 +1182,63 @@ rzg2l_cpg_pll_clk_register(const struct cpg_core_clk= *core, return pll_clk->hw.clk; } =20 +static int rzg3l_cpg_pll_clk_is_enabled(struct clk_hw *hw) +{ + struct pll_clk *pll_clk =3D to_pll(hw); + struct rzg2l_cpg_priv *priv =3D pll_clk->priv; + u32 val =3D readl(priv->base + RZG3L_PLL_MON_OFFSET(pll_clk->conf)); + u32 mon_val =3D RZG3L_PLL_MON_RESETB | RZG3L_PLL_MON_LOCK; + + /* Ensure both RESETB and LOCK bits are set */ + return (mon_val =3D=3D (val & mon_val)); +} + +static int rzg3l_cpg_pll_clk_endisable(struct clk_hw *hw, bool enable) +{ + struct pll_clk *pll_clk =3D to_pll(hw); + struct rzg2l_cpg_priv *priv =3D pll_clk->priv; + u32 stby_offset, mon_offset; + u32 val, mon_val; + int ret; + + stby_offset =3D RZG3L_PLL_STBY_OFFSET(pll_clk->conf); + mon_offset =3D RZG3L_PLL_MON_OFFSET(pll_clk->conf); + + if (enable) { + val =3D RZG3L_PLL_STBY_RESETB_WEN | RZG3L_PLL_STBY_RESETB; + mon_val =3D RZG3L_PLL_MON_RESETB | RZG3L_PLL_MON_LOCK; + } else { + val =3D RZG3L_PLL_STBY_RESETB_WEN; + mon_val =3D 0; + } + + writel(val, priv->base + stby_offset); + + /* ensure PLL is in normal/standby mode */ + ret =3D readl_poll_timeout_atomic(priv->base + mon_offset, val, mon_val = =3D=3D + (val & (RZG3L_PLL_MON_RESETB | RZG3L_PLL_MON_LOCK)), + 10, 100); + if (ret) + dev_err(priv->dev, "Failed to %s PLL 0x%x/%pC\n", enable ? + "enable" : "disable", stby_offset, hw->clk); + + return ret; +} + +static int rzg3l_cpg_pll_clk_enable(struct clk_hw *hw) +{ + if (rzg3l_cpg_pll_clk_is_enabled(hw)) + return 0; + + return rzg3l_cpg_pll_clk_endisable(hw, true); +} + +static const struct clk_ops rzg3l_cpg_pll_ops =3D { + .is_enabled =3D rzg3l_cpg_pll_clk_is_enabled, + .enable =3D rzg3l_cpg_pll_clk_enable, + .recalc_rate =3D rzg3s_cpg_pll_clk_recalc_rate, +}; + static struct clk *rzg2l_cpg_clk_src_twocell_get(struct of_phandle_args *clkspec, void *data) @@ -1258,6 +1322,9 @@ rzg2l_cpg_register_core_clk(const struct cpg_core_clk= *core, case CLK_TYPE_SAM_PLL: clk =3D rzg2l_cpg_pll_clk_register(core, priv, &rzg2l_cpg_pll_ops); break; + case CLK_TYPE_G3L_PLL: + clk =3D rzg2l_cpg_pll_clk_register(core, priv, &rzg3l_cpg_pll_ops); + break; case CLK_TYPE_G3S_PLL: clk =3D rzg2l_cpg_pll_clk_register(core, priv, &rzg3s_cpg_pll_ops); break; diff --git a/drivers/clk/renesas/rzg2l-cpg.h b/drivers/clk/renesas/rzg2l-cp= g.h index 10baf9e71a6e..ebd612d117c0 100644 --- a/drivers/clk/renesas/rzg2l-cpg.h +++ b/drivers/clk/renesas/rzg2l-cpg.h @@ -123,6 +123,7 @@ enum clk_types { CLK_TYPE_IN, /* External Clock Input */ CLK_TYPE_FF, /* Fixed Factor Clock */ CLK_TYPE_SAM_PLL, + CLK_TYPE_G3L_PLL, CLK_TYPE_G3S_PLL, =20 /* Clock with divider */ @@ -152,6 +153,9 @@ enum clk_types { DEF_TYPE(_name, _id, _type, .parent =3D _parent) #define DEF_SAMPLL(_name, _id, _parent, _conf) \ DEF_TYPE(_name, _id, CLK_TYPE_SAM_PLL, .parent =3D _parent, .conf =3D _co= nf) +#define DEF_G3L_PLL(_name, _id, _parent, _conf, _default_rate) \ + DEF_TYPE(_name, _id, CLK_TYPE_G3L_PLL, .parent =3D _parent, .conf =3D _co= nf, \ + .default_rate =3D _default_rate) #define DEF_G3S_PLL(_name, _id, _parent, _conf, _default_rate) \ DEF_TYPE(_name, _id, CLK_TYPE_G3S_PLL, .parent =3D _parent, .conf =3D _co= nf, \ .default_rate =3D _default_rate) --=20 2.43.0 From nobody Sat Apr 25 11:50:57 2026 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19F6F2F6918 for ; Thu, 23 Apr 2026 13:50:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776952261; cv=none; b=Fzxwq8qEJHjdhuzeV9ewsZfcuvT/c+gQpzkjSwQQmyA88AbUBREb+DzAlDyofKit8ZtCiFf5w72h2/Q6++zGgbbwxQzBASQd3V/ccRCgg6TAyrsncpc46IACUK9nq5DxJQEz0IeA9ZdkKcnzQj8iL8vV6cNtthbs685hTdiBg/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776952261; c=relaxed/simple; bh=5wTnhObAgPuPoQVvH1SJarmU20nNvDLvu1wr42afUuw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kP2JUpezQOLgiYQ7sX/UT7ckbUiUgnjoblCMcGuzQXrPfJOyyAKoItaeGtUKxphj8Q9QXSdgxUgg7nI27K6u9k2zxvhJOtoN1zJt5vixM7aBXNpZcmmBEl96BTjfamjGpcPOadQU6UBP/+Nh7oZ4b3i0rgsfm/R7vicMA6L+aFY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=blV0tnyl; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="blV0tnyl" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4896c22fcbaso39714325e9.0 for ; Thu, 23 Apr 2026 06:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776952256; x=1777557056; darn=vger.kernel.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=ClbUnDx7cL/cY/tkUoHImXX4Jy/87lG9dAwUJcgMD1k=; b=blV0tnylRHPZk4Drz4TFOTmZW3y3UJ60IezaXiM0xRIJ6JIdm5bCr3PrcwLiRNvTcq 4VryLojRdxgdrFnLVDC7Uf5fzXYY/icmZiJJMV9srDUvod8sgCkKaqQedrBCoku2s5b/ RxAJPBBSJyzZWmKVy8KUr1ai0C7gVKEp0pJM8sdLsbR76FxtCI0n3M8T1uQV8f2UqVqW R3p9Hkwc69jOt+Y7VwRBcFULOQiAp4/cT/P4mgz3VOztTHdG6KFXbL/38mB1SBS9uUbf 8sTEoCaqDAd/OT/VRDBo4f4/GF7TJja6Y+unsfdIxB4V4jJX1UXaWaRe+163Hs49svcx WDfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952256; x=1777557056; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ClbUnDx7cL/cY/tkUoHImXX4Jy/87lG9dAwUJcgMD1k=; b=KJTXNOTL1Z1X2TCQii02FTS5XPkOhALXetZHeQMcXZ+Mk/JDnD86OxSOrq3KGbyukB M2PU5gPKZoTJTTY3/i6OT8V/CUXnK6YWVKolduaHeGQAZLMkLJwKKz3gHebyjptEzhHe I54aypgzpSk154No+RR2ka2Ts1+7pmz4g6OhKH1nFo8Bbo8/CL/efvJRaORDqzWpsjGi z8dpHx6fwRaEWcuq7O7Z9cI9JIRpy3AxxYyJ1o4k8OT2oE13FaBqHAUlByjWcE24hrCd vInda2uhChT5nkJJWeeyx1hxSkWfYltSgGpRrmlARHzdTFc+bvQB4CoebLpQT25iZd1R fXEg== X-Forwarded-Encrypted: i=1; AFNElJ+4tCI/jhzQg3ls9yIoE2mSDuVTmCR0AUHPr0MNUQITKoo5c1MOHyQInQlyHhxLSYMOs84vh9U0x9irgy8=@vger.kernel.org X-Gm-Message-State: AOJu0YzgHWACbLAn2lHSjchbFa5V04xgUASecI5UBm0Eea3N0MjOJBFY xK8B5K7afJqxswYDfwop+qRQsuzQzscGx9cv2wjEuS8JiWMtpW8ECZEO X-Gm-Gg: AeBDieuMmNxY386MLY0XfzcDWJnefw4S6K9A6hFqZ67poCyTDqH1ULhTSUiEQcDgNqX jH9M0q4xqa350IK70YVGiOOqOZmC1Njxhp0LcXE0XaoTNxr7UnyMt8QpZZg5emRQUXQRCqo15HZ BUd1ueNVuFwLkNfn28cmd+sunYVKg0/sSkBnQ1mfmMgBi8Z03Vt6vacHUCpxDnnU0HeasIsRXan 6foCkqUkNxrenuJF1W9n1jaVpqpAbscktjWsya62yWfHEHw0JPlTrMEz5/+M/FTM2txlVI9Etov OmwHiedyPybf0UibIPGT2Mn/th/RqZVCuSEHxHjz9Uct0ObzzpZ59kSQ4rmCwLKrVVjNx2iKYZZ 08kmtR7B6efcr2kX7k4SpmsxODHu4CEV7XgSPhfkopPUu2IjfHNABsFjjLTKy6ehAcIX5o/mXPC evYY/O7SBNXEU+nesmPDlhTbUb0oTddFekqCtCb/tv0yIe9DO6kBcON7g9NZI= X-Received: by 2002:a05:600c:5246:b0:487:219e:42d with SMTP id 5b1f17b1804b1-488fb750a1dmr383325315e9.11.1776952255969; Thu, 23 Apr 2026 06:50:55 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:c2c5:eec8:9509:382e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a52583fe7sm228134335e9.13.2026.04.23.06.50.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 06:50:55 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd Cc: Biju Das , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v6 2/3] clk: renesas: r8a08g046: Add support for PLL6 clk Date: Thu, 23 Apr 2026 14:50:46 +0100 Message-ID: <20260423135050.238400-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423135050.238400-1-biju.das.jz@bp.renesas.com> References: <20260423135050.238400-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Add support for PLL6 clk by registering with rzg2l-cpg driver. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven --- v5->v6: * Collected the tag. v4->v5: * Rebased to boot series. v3->v4: * No change v2->v3: * No change v1->v2: * No change --- drivers/clk/renesas/r9a08g046-cpg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clk/renesas/r9a08g046-cpg.c b/drivers/clk/renesas/r9a0= 8g046-cpg.c index 6759957980f2..fed9607af216 100644 --- a/drivers/clk/renesas/r9a08g046-cpg.c +++ b/drivers/clk/renesas/r9a08g046-cpg.c @@ -29,6 +29,9 @@ #define G3L_DIVPL2B_STS DDIV_PACK(G3L_CLKDIVSTATUS, 5, 1) #define G3L_DIVPL3A_STS DDIV_PACK(G3L_CLKDIVSTATUS, 8, 1) =20 +/* PLL 1/4/6/7 configuration registers macro. */ +#define G3L_PLL1467_CONF(clk1, clk2, setting) ((clk1) << 22 | (clk2) << 12= | (setting)) + enum clk_ids { /* Core Clock Outputs exported to DT */ LAST_DT_CORE_CLK =3D R9A08G046_USB_SCLK, @@ -45,6 +48,7 @@ enum clk_ids { CLK_PLL2_DIV2, CLK_PLL3, CLK_PLL3_DIV2, + CLK_PLL6, =20 /* Module Clocks */ MOD_CLK_BASE, @@ -78,6 +82,8 @@ static const struct cpg_core_clk r9a08g046_core_clks[] __= initconst =3D { /* Internal Core Clocks */ DEF_FIXED(".pll2", CLK_PLL2, CLK_EXTAL, 200, 3), DEF_FIXED(".pll3", CLK_PLL3, CLK_EXTAL, 200, 3), + DEF_G3L_PLL(".pll6", CLK_PLL6, CLK_EXTAL, G3L_PLL1467_CONF(0x54, 0x58, 0), + 500000000UL), DEF_FIXED(".pll2_div2", CLK_PLL2_DIV2, CLK_PLL2, 1, 2), DEF_FIXED(".pll3_div2", CLK_PLL3_DIV2, CLK_PLL3, 1, 2), =20 --=20 2.43.0 From nobody Sat Apr 25 11:50:57 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CDE0199FB0 for ; Thu, 23 Apr 2026 13:51:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776952264; cv=none; b=MdpF0uvwdy1shOF1t3K5860Rp1RHreWFqkYDC4USpcm8vOJJnLlqsDtvczCvzuxwlOR5L0xoTPS/HrqiXiGDLxu1FoNWWL+WH3Xk0K/bnIt3pbKs0r7kDSakf4U6O6w+/7Uvhdk6uwuy7D1y5ITptGu35cpFwlgQNwbRwMEdHOM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776952264; c=relaxed/simple; bh=WbohLoV7uCSpg7CAwyTG+vEaPBDpqMrHnamtEXxNmTg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W/Wm+a6QQIKB2Zq7wM050TyKvYNAqE/pmtpqIA+5z7FOOmASHXMn23SoPnKkKiR3HZqavSpDaeGKWNrHKxplafamkdaS+69VdrC4fBj2g1pXSb7ri8h6AWn8dfjx3BdpgyIzXTZ2C4Q807i7XQU4/JgdupCcYxPmKrggEnrCpvo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=J0cNY4OV; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J0cNY4OV" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-48909558b3aso60185515e9.0 for ; Thu, 23 Apr 2026 06:50:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776952257; x=1777557057; darn=vger.kernel.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=LircxQzS5HiZNDdUHUIDfoQikbSRUjoEmSPit1De9mg=; b=J0cNY4OVnyoXp+/aWAi73aw8ulQY1MCb3UZTjjPbcqSY8uZLkjSDgJRGh1qeJ4/M3d s0s+zK8+S/vUDJOJTLwaZqE3QwEcIQ5V/FJDQ6PBi0lnbbmhI9rw1NWUROC0qe4TZvtH 9dH7WDdvZG8wO32XH0hoA84vb6FdzMWz7h9xV6K6tBcrCwpDwlFTOCrbmlSaK5JR95CV PeuAVyR+x7KzIl00BMeYmnpc+/Fe+JI+t9ihlCYE0saa7N1gfYURh3ISMXdnH6vSaPtK kNxJdcInaSW8QbrR7IXW3jZefZQwYqbHB8Ic3BernInO4EB6vMgjm8ZFHbdw9tFvb3Nu jihg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776952257; x=1777557057; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LircxQzS5HiZNDdUHUIDfoQikbSRUjoEmSPit1De9mg=; b=FkcXGgDgrnHK/c+m9hk42kqxms6wKeDDAi5OXEr3pVXJcdZ24bAndS7ZLvoeYD095h O5DBIrrlxfjKQBQyvamDBWPPY3v/4Xf/l283N3zxp0EbuDarui8nZwVAAuwhPDzQ41GB oo18gHq3+2YZ9ACWrIK6RY+dIil/KXMqkkKnYtEo/mEC78vRy/5Ehjap5IjyOu2sixVZ cTuG7ErPcxN7sUfKs1DyM69oE9E7Bhv0VbNYfYyL4AeEMynpczNfCgBhKD+Lg3Bg8nUr 9vwvFXQh+KT3R075zg8V9jU3W4qYqW/giRCw9zO2XV3DEyRumGKhu9KXRYebgI25OfGy PzLg== X-Forwarded-Encrypted: i=1; AFNElJ9ns8vxKahse0uteacNckheQXbZ0Q7mtIaDV8WBC931np/lLqrO378LDJ1Jp9XJh1NY7YCLp4nKEmL4sxA=@vger.kernel.org X-Gm-Message-State: AOJu0YxBm+WErHwqUMVnkhcD9n93+4FON5EA3IDTV4NciJIE4yIwOlmB oKgL5u1HjeIOoP0x2OcdhfUECH14+YSakB4R/9rG2jUe/JQy7PEa6Is0 X-Gm-Gg: AeBDieusn7SeTUjgqS2v6vQ9GeUvBb1G2RZCinC0T1sbtqUXL3clILvJ2BBaFx60Qpj AietCKcjZ02hQ8FmjvuhAy085NelTpaa7lQ2NUpzH351YTTqfKdU7BxPcoNo2cuaIDr6Mou7gtx uOB1NUdTwSVOErfgWG3X3wfxkQ2bcMNX4c0RP6ZTx32gY1h7gA4JN68FqdIIiaVaoyk7LuwpxJ5 t/0wrH/DHU104GMCw/vaXaa9Y8tho0Iij8wKQlrV0vQxkE/VL5KvjWJMOt+DSJKTyDsnkSCSBiS a+fraWp83yxoAfV9XuU4hn4zPHjBGK+C0L3ni8eMzj8ODpvqcCYxXRDFYTz7nsVgou/2HYH31NN eMcLu++JM1qOcNLVK7xXfVKDLYFFS9JVhr6s5stbLaobk5YvPZjd/McaA7acPxOc7vXGAMgeXsQ BJUoSE1TZEzsqdspYtOaWcttBxf+qmcNL3dBqh0Z0iQQbQHYGueoacgqZzotk= X-Received: by 2002:a05:600c:621b:b0:487:5c0:671f with SMTP id 5b1f17b1804b1-488fb742e74mr426927995e9.9.1776952256979; Thu, 23 Apr 2026 06:50:56 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:c2c5:eec8:9509:382e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48a52583fe7sm228134335e9.13.2026.04.23.06.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2026 06:50:56 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd Cc: Biju Das , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH v6 3/3] clk: renesas: r9a08g046: Add clock and reset signals for the GBETH IPs Date: Thu, 23 Apr 2026 14:50:47 +0100 Message-ID: <20260423135050.238400-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260423135050.238400-1-biju.das.jz@bp.renesas.com> References: <20260423135050.238400-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Add clock and reset entries for the Gigabit Ethernet Interfaces (GBETH 0-1) IPs found on the RZ/G3L SoC. This includes various dividers and mux clocks needed by these two GBETH IPs. Also add tx, tx-180, rx, rx-180, rmii, rmii-tx and rmii-rx clocks to r9a08g046_no_pm_mod_clk table to avoid enabling both normal and rmii clocks by the PM framework. Signed-off-by: Biju Das --- v5->v6: * Updated parent of ETHRM{0,1} clocks to CLK_SEL_ETH{0,1}_RM * Fixed various DEF_COUPLED macro alignment issues by splitting it into 3 lines. v4->v5: * Rebased to boot series. v3->v4: * Updated commit description * Fixed mstop bit for eth1_clk_chi and eth0_{tx,rx}_i_rmii clocks * Added r9a08g046_no_pm_mod_clks to avoid PM framework enabling both rgmii and rmii clocks together as they are mutually exclusive. * Fixed checkpatch warning for more than 100 columns v2->v3: * Added eth{0,1}_{tx,rx}_i_rmii clocks. v1->v2: * No change --- drivers/clk/renesas/r9a08g046-cpg.c | 151 ++++++++++++++++++++++++++++ drivers/clk/renesas/rzg2l-cpg.h | 6 ++ 2 files changed, 157 insertions(+) diff --git a/drivers/clk/renesas/r9a08g046-cpg.c b/drivers/clk/renesas/r9a0= 8g046-cpg.c index fed9607af216..d630b8eab110 100644 --- a/drivers/clk/renesas/r9a08g046-cpg.c +++ b/drivers/clk/renesas/r9a08g046-cpg.c @@ -18,17 +18,35 @@ #define G3L_CPG_PL2_DDIV (0x204) #define G3L_CPG_PL3_DDIV (0x208) #define G3L_CLKDIVSTATUS (0x280) +#define G3L_CPG_ETH_SSEL (0x410) +#define G3L_CPG_ETH_SDIV (0x434) =20 /* RZ/G3L Specific division configuration. */ #define G3L_DIVPL2A DDIV_PACK(G3L_CPG_PL2_DDIV, 0, 2) #define G3L_DIVPL2B DDIV_PACK(G3L_CPG_PL2_DDIV, 4, 2) #define G3L_DIVPL3A DDIV_PACK(G3L_CPG_PL3_DDIV, 0, 2) +#define G3L_SDIV_ETH_A DDIV_PACK(G3L_CPG_ETH_SDIV, 0, 2) +#define G3L_SDIV_ETH_B DDIV_PACK(G3L_CPG_ETH_SDIV, 4, 1) +#define G3L_SDIV_ETH_C DDIV_PACK(G3L_CPG_ETH_SDIV, 8, 2) +#define G3L_SDIV_ETH_D DDIV_PACK(G3L_CPG_ETH_SDIV, 12, 1) =20 /* RZ/G3L Clock status configuration. */ #define G3L_DIVPL2A_STS DDIV_PACK(G3L_CLKDIVSTATUS, 4, 1) #define G3L_DIVPL2B_STS DDIV_PACK(G3L_CLKDIVSTATUS, 5, 1) #define G3L_DIVPL3A_STS DDIV_PACK(G3L_CLKDIVSTATUS, 8, 1) =20 +/* RZ/G3L Specific clocks select. */ +#define G3L_SEL_ETH0_TX SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 0, 1) +#define G3L_SEL_ETH0_RX SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 1, 1) +#define G3L_SEL_ETH0_RM SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 2, 1) +#define G3L_SEL_ETH0_CLK_TX_I SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 3, 1) +#define G3L_SEL_ETH0_CLK_RX_I SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 4, 1) +#define G3L_SEL_ETH1_TX SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 8, 1) +#define G3L_SEL_ETH1_RX SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 9, 1) +#define G3L_SEL_ETH1_RM SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 10, 1) +#define G3L_SEL_ETH1_CLK_TX_I SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 11, 1) +#define G3L_SEL_ETH1_CLK_RX_I SEL_PLL_PACK(G3L_CPG_ETH_SSEL, 12, 1) + /* PLL 1/4/6/7 configuration registers macro. */ #define G3L_PLL1467_CONF(clk1, clk2, setting) ((clk1) << 22 | (clk2) << 12= | (setting)) =20 @@ -49,12 +67,29 @@ enum clk_ids { CLK_PLL3, CLK_PLL3_DIV2, CLK_PLL6, + CLK_PLL6_DIV10, + CLK_SEL_ETH0_TX, + CLK_SEL_ETH0_RX, + CLK_SEL_ETH0_RM, + CLK_SEL_ETH1_TX, + CLK_SEL_ETH1_RX, + CLK_SEL_ETH1_RM, + CLK_ETH0_TR, + CLK_ETH0_RM, + CLK_ETH1_TR, + CLK_ETH1_RM, =20 /* Module Clocks */ MOD_CLK_BASE, }; =20 /* Divider tables */ +static const struct clk_div_table dtable_2_20[] =3D { + { 0, 2 }, + { 1, 20 }, + { 0, 0 }, +}; + static const struct clk_div_table dtable_4_128[] =3D { { 0, 4 }, { 1, 8 }, @@ -63,6 +98,13 @@ static const struct clk_div_table dtable_4_128[] =3D { { 0, 0 }, }; =20 +static const struct clk_div_table dtable_4_200[] =3D { + { 0, 4 }, + { 1, 20 }, + { 2, 200 }, + { 0, 0 }, +}; + static const struct clk_div_table dtable_8_256[] =3D { { 0, 8 }, { 1, 16 }, @@ -71,6 +113,18 @@ static const struct clk_div_table dtable_8_256[] =3D { { 0, 0 }, }; =20 +/* Mux clock names tables. */ +static const char * const sel_eth0_tx[] =3D { ".div_eth0_tr", "eth0_txc_tx= _clk" }; +static const char * const sel_eth0_rx[] =3D { ".div_eth0_tr", "eth0_rxc_rx= _clk" }; +static const char * const sel_eth0_rm[] =3D { ".pll6_div10", "eth0_rxc_rx_= clk" }; +static const char * const sel_eth1_tx[] =3D { ".div_eth1_tr", "eth1_txc_tx= _clk" }; +static const char * const sel_eth1_rx[] =3D { ".div_eth1_tr", "eth1_rxc_rx= _clk" }; +static const char * const sel_eth1_rm[] =3D { ".pll6_div10", "eth1_rxc_rx_= clk" }; +static const char * const sel_eth0_clk_tx_i[] =3D { ".sel_eth0_tx", ".div_= eth0_rm" }; +static const char * const sel_eth0_clk_rx_i[] =3D { ".sel_eth0_rx", ".div_= eth0_rm" }; +static const char * const sel_eth1_clk_tx_i[] =3D { ".sel_eth1_tx", ".div_= eth1_rm" }; +static const char * const sel_eth1_clk_rx_i[] =3D { ".sel_eth1_rx", ".div_= eth1_rm" }; + static const struct cpg_core_clk r9a08g046_core_clks[] __initconst =3D { /* External Clock Inputs */ DEF_INPUT("extal", CLK_EXTAL), @@ -86,6 +140,17 @@ static const struct cpg_core_clk r9a08g046_core_clks[] = __initconst =3D { 500000000UL), DEF_FIXED(".pll2_div2", CLK_PLL2_DIV2, CLK_PLL2, 1, 2), DEF_FIXED(".pll3_div2", CLK_PLL3_DIV2, CLK_PLL3, 1, 2), + DEF_FIXED(".pll6_div10", CLK_PLL6_DIV10, CLK_PLL6, 1, 10), + DEF_MUX(".sel_eth0_tx", CLK_SEL_ETH0_TX, G3L_SEL_ETH0_TX, sel_eth0_tx), + DEF_MUX(".sel_eth0_rx", CLK_SEL_ETH0_RX, G3L_SEL_ETH0_RX, sel_eth0_rx), + DEF_MUX(".sel_eth0_rm", CLK_SEL_ETH0_RM, G3L_SEL_ETH0_RM, sel_eth0_rm), + DEF_MUX(".sel_eth1_tx", CLK_SEL_ETH1_TX, G3L_SEL_ETH1_TX, sel_eth1_tx), + DEF_MUX(".sel_eth1_rx", CLK_SEL_ETH1_RX, G3L_SEL_ETH1_RX, sel_eth1_rx), + DEF_MUX(".sel_eth1_rm", CLK_SEL_ETH1_RM, G3L_SEL_ETH1_RM, sel_eth1_rm), + DEF_DIV(".div_eth0_tr", CLK_ETH0_TR, CLK_PLL6, G3L_SDIV_ETH_A, dtable_4_2= 00), + DEF_DIV(".div_eth1_tr", CLK_ETH1_TR, CLK_PLL6, G3L_SDIV_ETH_C, dtable_4_2= 00), + DEF_DIV(".div_eth0_rm", CLK_ETH0_RM, CLK_SEL_ETH0_RM, G3L_SDIV_ETH_B, dta= ble_2_20), + DEF_DIV(".div_eth1_rm", CLK_ETH1_RM, CLK_SEL_ETH1_RM, G3L_SDIV_ETH_D, dta= ble_2_20), =20 /* Core output clk */ DEF_G3S_DIV("P0", R9A08G046_CLK_P0, CLK_PLL2_DIV2, G3L_DIVPL2B, G3L_DIVPL= 2B_STS, @@ -94,6 +159,21 @@ static const struct cpg_core_clk r9a08g046_core_clks[] = __initconst =3D { dtable_4_128, 0, 0, 0, NULL), DEF_G3S_DIV("P3", R9A08G046_CLK_P3, CLK_PLL2_DIV2, G3L_DIVPL2A, G3L_DIVPL= 2A_STS, dtable_4_128, 0, 0, 0, NULL), + DEF_FIXED("HP", R9A08G046_CLK_HP, CLK_PLL6_DIV10, 1, 1), + DEF_MUX_FLAGS("ETHTX01", R9A08G046_CLK_ETHTX01, G3L_SEL_ETH0_CLK_TX_I, se= l_eth0_clk_tx_i, + CLK_SET_RATE_PARENT), + DEF_MUX_FLAGS("ETHRX01", R9A08G046_CLK_ETHRX01, G3L_SEL_ETH0_CLK_RX_I, se= l_eth0_clk_rx_i, + CLK_SET_RATE_PARENT), + DEF_MUX_FLAGS("ETHTX11", R9A08G046_CLK_ETHTX11, G3L_SEL_ETH1_CLK_TX_I, se= l_eth1_clk_tx_i, + CLK_SET_RATE_PARENT), + DEF_MUX_FLAGS("ETHRX11", R9A08G046_CLK_ETHRX11, G3L_SEL_ETH1_CLK_RX_I, se= l_eth1_clk_rx_i, + CLK_SET_RATE_PARENT), + DEF_FIXED("ETHRM0", R9A08G046_CLK_ETHRM0, CLK_SEL_ETH0_RM, 1, 1), + DEF_FIXED("ETHTX02", R9A08G046_CLK_ETHTX02, CLK_SEL_ETH0_TX, 1, 1), + DEF_FIXED("ETHRX02", R9A08G046_CLK_ETHRX02, CLK_SEL_ETH0_RX, 1, 1), + DEF_FIXED("ETHRM1", R9A08G046_CLK_ETHRM1, CLK_SEL_ETH1_RM, 1, 1), + DEF_FIXED("ETHTX12", R9A08G046_CLK_ETHTX12, CLK_SEL_ETH1_TX, 1, 1), + DEF_FIXED("ETHRX12", R9A08G046_CLK_ETHRX12, CLK_SEL_ETH1_RX, 1, 1), }; =20 static const struct rzg2l_mod_clk r9a08g046_mod_clks[] =3D { @@ -107,6 +187,54 @@ static const struct rzg2l_mod_clk r9a08g046_mod_clks[]= =3D { MSTOP(BUS_REG1, BIT(2))), DEF_MOD("dmac_pclk", R9A08G046_DMAC_PCLK, R9A08G046_CLK_P3, 0x52c, 1, MSTOP(BUS_REG1, BIT(3))), + DEF_MOD("eth0_clk_axi", R9A08G046_ETH0_CLK_AXI, R9A08G046_CLK_P1, 0x57c,= 0, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_MOD("eth1_clk_axi", R9A08G046_ETH1_CLK_AXI, R9A08G046_CLK_P1, 0x57c,= 1, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_MOD("eth0_clk_chi", R9A08G046_ETH0_CLK_CHI, R9A08G046_CLK_P1, 0x57c,= 2, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_MOD("eth1_clk_chi", R9A08G046_ETH1_CLK_CHI, R9A08G046_CLK_P1, 0x57c,= 3, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_COUPLED("eth0_tx_i", R9A08G046_ETH0_CLK_TX_I, R9A08G046_CLK_ETHTX01, = 0x57c, 4, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_COUPLED("eth0_tx_180_i", R9A08G046_ETH0_CLK_TX_180_I, R9A08G046_CLK_E= THTX02, + 0x57c, 4, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_COUPLED("eth1_tx_i", R9A08G046_ETH1_CLK_TX_I, R9A08G046_CLK_ETHTX11, = 0x57c, 5, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_COUPLED("eth1_tx_180_i", R9A08G046_ETH1_CLK_TX_180_I, R9A08G046_CLK_E= THTX12, + 0x57c, 5, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_COUPLED("eth0_rx_i", R9A08G046_ETH0_CLK_RX_I, R9A08G046_CLK_ETHRX01, = 0x57c, 6, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_COUPLED("eth0_rx_180_i", R9A08G046_ETH0_CLK_RX_180_I, R9A08G046_CLK_E= THRX02, + 0x57c, 6, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_COUPLED("eth1_rx_i", R9A08G046_ETH1_CLK_RX_I, R9A08G046_CLK_ETHRX11, = 0x57c, 7, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_COUPLED("eth1_rx_180_i", R9A08G046_ETH1_CLK_RX_180_I, R9A08G046_CLK_E= THRX12, + 0x57c, 7, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_MOD("eth0_ptp_ref_i", R9A08G046_ETH0_CLK_PTP_REF_I, R9A08G046_CLK_HP,= 0x57c, 8, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_MOD("eth1_ptp_ref_i", R9A08G046_ETH1_CLK_PTP_REF_I, R9A08G046_CLK_HP,= 0x57c, 9, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_MOD("eth0_rmii_i", R9A08G046_ETH0_CLK_RMII_I, R9A08G046_CLK_ETHRM0, = 0x57c, 10, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_MOD("eth1_rmii_i", R9A08G046_ETH1_CLK_RMII_I, R9A08G046_CLK_ETHRM1, = 0x57c, 11, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_COUPLED("eth0_tx_i_rmii", R9A08G046_ETH0_CLK_TX_I_RMII, R9A08G046_CLK= _ETHTX01, + 0x57c, 12, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_COUPLED("eth0_rx_i_rmii", R9A08G046_ETH0_CLK_RX_I_RMII, R9A08G046_CLK= _ETHRX01, + 0x57c, 12, + MSTOP(BUS_PERI_COM, BIT(2))), + DEF_COUPLED("eth1_tx_i_rmii", R9A08G046_ETH1_CLK_TX_I_RMII, R9A08G046_CLK= _ETHTX11, + 0x57c, 13, + MSTOP(BUS_PERI_COM, BIT(3))), + DEF_COUPLED("eth1_rx_i_rmii", R9A08G046_ETH1_CLK_RX_I_RMII, R9A08G046_CLK= _ETHRX11, + 0x57c, 13, + MSTOP(BUS_PERI_COM, BIT(3))), DEF_MOD("scif0_clk_pck", R9A08G046_SCIF0_CLK_PCK, R9A08G046_CLK_P0, 0x584= , 0, MSTOP(BUS_MCPU2, BIT(1))), }; @@ -117,6 +245,8 @@ static const struct rzg2l_reset r9a08g046_resets[] =3D { DEF_RST(R9A08G046_IA55_RESETN, 0x818, 0), DEF_RST(R9A08G046_DMAC_ARESETN, 0x82c, 0), DEF_RST(R9A08G046_DMAC_RST_ASYNC, 0x82c, 1), + DEF_RST(R9A08G046_ETH0_ARESET_N, 0x87c, 0), + DEF_RST(R9A08G046_ETH1_ARESET_N, 0x87c, 1), DEF_RST(R9A08G046_SCIF0_RST_SYSTEM_N, 0x884, 0), }; =20 @@ -131,6 +261,23 @@ static const unsigned int r9a08g046_crit_resets[] =3D { R9A08G046_DMAC_RST_ASYNC, }; =20 +static const unsigned int r9a08g046_no_pm_mod_clks[] =3D { + MOD_CLK_BASE + R9A08G046_ETH0_CLK_TX_I, + MOD_CLK_BASE + R9A08G046_ETH0_CLK_TX_180_I, + MOD_CLK_BASE + R9A08G046_ETH0_CLK_RX_I, + MOD_CLK_BASE + R9A08G046_ETH0_CLK_RX_180_I, + MOD_CLK_BASE + R9A08G046_ETH0_CLK_RMII_I, + MOD_CLK_BASE + R9A08G046_ETH0_CLK_TX_I_RMII, + MOD_CLK_BASE + R9A08G046_ETH0_CLK_RX_I_RMII, + MOD_CLK_BASE + R9A08G046_ETH1_CLK_TX_I, + MOD_CLK_BASE + R9A08G046_ETH1_CLK_TX_180_I, + MOD_CLK_BASE + R9A08G046_ETH1_CLK_RX_I, + MOD_CLK_BASE + R9A08G046_ETH1_CLK_RX_180_I, + MOD_CLK_BASE + R9A08G046_ETH1_CLK_RMII_I, + MOD_CLK_BASE + R9A08G046_ETH1_CLK_TX_I_RMII, + MOD_CLK_BASE + R9A08G046_ETH1_CLK_RX_I_RMII, +}; + const struct rzg2l_cpg_info r9a08g046_cpg_info =3D { /* Core Clocks */ .core_clks =3D r9a08g046_core_clks, @@ -147,6 +294,10 @@ const struct rzg2l_cpg_info r9a08g046_cpg_info =3D { .num_mod_clks =3D ARRAY_SIZE(r9a08g046_mod_clks), .num_hw_mod_clks =3D R9A08G046_BSC_X_BCK_BSC + 1, =20 + /* No PM modules Clocks */ + .no_pm_mod_clks =3D r9a08g046_no_pm_mod_clks, + .num_no_pm_mod_clks =3D ARRAY_SIZE(r9a08g046_no_pm_mod_clks), + /* Resets */ .resets =3D r9a08g046_resets, .num_resets =3D R9A08G046_BSC_X_PRESET_BSC + 1, /* Last reset ID + 1 */ diff --git a/drivers/clk/renesas/rzg2l-cpg.h b/drivers/clk/renesas/rzg2l-cp= g.h index ebd612d117c0..0e63b62e8435 100644 --- a/drivers/clk/renesas/rzg2l-cpg.h +++ b/drivers/clk/renesas/rzg2l-cpg.h @@ -188,6 +188,12 @@ enum clk_types { .parent_names =3D _parent_names, \ .num_parents =3D ARRAY_SIZE(_parent_names), \ .mux_flags =3D CLK_MUX_READ_ONLY) +#define DEF_MUX_FLAGS(_name, _id, _conf, _parent_names, _flag) \ + DEF_TYPE(_name, _id, CLK_TYPE_MUX, .conf =3D _conf, \ + .parent_names =3D _parent_names, \ + .num_parents =3D ARRAY_SIZE(_parent_names), \ + .mux_flags =3D CLK_MUX_HIWORD_MASK, \ + .flag =3D _flag) #define DEF_SD_MUX(_name, _id, _conf, _sconf, _parent_names, _mtable, _clk= _flags, _notifier) \ DEF_TYPE(_name, _id, CLK_TYPE_SD_MUX, .conf =3D _conf, .sconf =3D _sconf,= \ .parent_names =3D _parent_names, \ --=20 2.43.0