From nobody Mon Feb 9 02:42:39 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 3AF9B38F937 for ; Fri, 6 Feb 2026 10:53:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375196; cv=none; b=gKPcjrNKdxb14fV5MyXxdQz5vcvrwBqJPyOeyXy1RNUv/9eiIiC1aer8AzY1JbvL+C3LGPUQaIHuCjaE/0OrkSD/CkGmeDQg3axX0t1Tmd+/3exqYsEZc19uTCDNrU4IaoANpXFiC2DtTVWrQqW/3n3vP3IIADGOI2NV+k+L2NE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375196; c=relaxed/simple; bh=ADGZX1kaLQxBtMAwjetAO0IYz9qSFbFJW6C9e9h65Ks=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ht6YLWK4n04oR3Woe8knFddqYXznGYOwvkWs2tdeDRGfJAhCgIkMIXcmZNvj6U4AUoN7H35AEZUyV0Hh71ecHL0Fv5dWaoclzXU8+9WbvBGTjtdIejLiAC9Z5zuu6zCcn2T9Av7ROpfeEdkbjDXW22kxNlVFJqrrI1CtXbowzg0= 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=QzNGpdV5; arc=none smtp.client-ip=209.85.221.42 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="QzNGpdV5" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-43284ed32a0so1252372f8f.3 for ; Fri, 06 Feb 2026 02:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770375195; x=1770979995; 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=Qs9Gkx1rz7xGBYd71ho1RwbM3cX0c0FSNNlweHUIWZY=; b=QzNGpdV5huY49t4L6JnLwQFu3GZ4JoLrLvNOFtRAKwTMeiJ0Y1IUwVDvRz79kbpLAi oNADqPQT/T1sumXkETtM1nQCxfsz3KP2k3u/nvM3dr1fIHOnlLTnZ1V/JegGUjE1vTHB GPFd6y2Hok4YxAZCVNoDs7aoA9frM8fZK5AesoqBKQXfw3poICZeDxoku51pIOHye+b0 jBbji+cxf+kolHMx1ISeENYmgPxdxUR0MtBQPC0yV8xLzKR6NUOhZL+il24E5nPbrszL LKOyZRQIfiaL12stkQQQDsNyujJqR25Tk1LZk94HC5OaXNswjZC268MKKF324CAiL32P Nguw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770375195; x=1770979995; 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=Qs9Gkx1rz7xGBYd71ho1RwbM3cX0c0FSNNlweHUIWZY=; b=W/9nYEZjTjRUExqQMPAoI88qfhazlqAW6bSUWvlvTJ3nMfkLlFmgokXVfoWSXbtVVu CB1UPVYqVRyoC7e+NABPSWXqjD2su0HoUtebm+uWtk1tbe+ngFmAvaZQoY6fEhJZ5k0m Z85eNsoHcn2fuZTMPtMhDN0eeU0YLaGMQgnTWs9a7CnLoXhSVPLnGcMFVIbcfAfjr9nl hHbbVElwjr22ciL/6mJLi2A6TYwoaBYdghW/BmBw8XjYQoI5ic9jKHaMb5dXwxSMLVYv 8SpQR51ZzlSoQhNG/cZbCVKLJauDjmmA81gLnmV2Vt45doUXN69wVVIG/hES9ptTW9we 9VvQ== X-Forwarded-Encrypted: i=1; AJvYcCVHugqwg677iRW8EqiA/68XouwEgvn++vO4FQvkQ08lwAut3qW0mND5i1X9yTYbxsGLv6Oo1CI0RKXuwa8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0DjOvnNZSMVVU9vp4f1UTxAArIsXFQJBYIZUGYmQ1ZqqHv3D8 u9aAtM2VhEu2FE7kLFaqLI4lmeNrr+wRSp9y5UUGJB+Bbfv6KjTtNpmY X-Gm-Gg: AZuq6aKDnVY/WYbogTdOJksXJPtnUbi6WvKHxiiioC2ywyLznQNzt74EKsVd8oxbjQF E0NQNiE1dqeIZ/9IiZ18+XEGHGS3b6jBmltmBzh9Zf0tB73UJc3UwE3BE7cUDT4e+Rbkn2+L3Fm 0shP9d+jsArVnWT+pdVfIgq+6RjqStfLCaU1MG7d9Bw9UjJnfEoBEmOEYRB6HERUx1/0yN/OG6L mz4RfOAlERgzbtRELIuWNN+TNFiaOljEoJnMxHonggqIGlk/6brvzRpm6NswX6fk9K4snua64vo gkrzR8RA80BnTgS/ffa3FxTxNyQthMx87c5QEmWxPV6zApdn7LlkZ7ma6sZSmZItQnNlLms7b6u tO3QyhNeA8OUOJoeHb/76qeWDTl0i2/cn+sxopYSZ44xz+aktuVoIB0pKyJeZIcCiaaTrqU4qJw 86nh9A2qQE5Ci2F06EVQ== X-Received: by 2002:a05:6000:4284:b0:430:fbe1:3822 with SMTP id ffacd0b85a97d-4362938d7cemr3657506f8f.54.1770375194552; Fri, 06 Feb 2026 02:53:14 -0800 (PST) Received: from biju.lan ([2a00:23c4:a758:8a01:1e64:f8d5:9d7a:19d4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43629730992sm4519611f8f.21.2026.02.06.02.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 02:53:14 -0800 (PST) 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 , Claudiu Beznea Subject: [PATCH v4 1/4] clk: renesas: rzg2l: Drop a check in rzg3s_cpg_pll_clk_recalc_rate() Date: Fri, 6 Feb 2026 10:53:01 +0000 Message-ID: <20260206105312.231015-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206105312.231015-1-biju.das.jz@bp.renesas.com> References: <20260206105312.231015-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 Drop the unwanted check in rzg3s_cpg_pll_clk_recalc_rate() as the function is SoC specific. Reviewed-by: Claudiu Beznea Signed-off-by: Biju Das --- v3->v4: * No change v2->v3: * Collected tag v1->v2: * No change --- drivers/clk/renesas/rzg2l-cpg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cp= g.c index f4deb5d3b837..945e31c8f161 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -1107,9 +1107,6 @@ static unsigned long rzg3s_cpg_pll_clk_recalc_rate(st= ruct clk_hw *hw, u32 nir, nfr, mr, pr, val, setting; u64 rate; =20 - if (pll_clk->type !=3D CLK_TYPE_G3S_PLL) - return parent_rate; - setting =3D GET_REG_SAMPLL_SETTING(pll_clk->conf); if (setting) { val =3D readl(priv->base + setting); --=20 2.43.0 From nobody Mon Feb 9 02:42:39 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 D41ED392C51 for ; Fri, 6 Feb 2026 10:53:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375197; cv=none; b=WLeAPWbY38euL406ugA5tJ/j1EqlD5vq7tG1zTFEYzRFvKhXgxg0uj4W9WmEirjy7d9MhTd8xnhaY1J+seyoyT9pYkOn8hFfXBtTgCKoZ1xEPg7EgZHLCUK85HOL9zWOJzljlj9NtsSK+djzkbUsqjJ4uBsq0Gz3dLkBTgugI1U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375197; c=relaxed/simple; bh=kjScV1T5/VdYayocYBA2dz1cbmi0EZoIfKkzXZdS0LA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OllLtMktVCKVU9tEWzhyrLNzrh5iHqsf+1479PgnXT9Ypf7F8hUgF5yKX8vbCKKhslDkz6eTRC+f/1qktseeabOfFFQ40QWfgnWdtgKkmf+BlFJyfgshgQEBYFLsqGMpWecTJ5PwsrgNkiTWSve4cXZUi01Z9CcZdycCBy9gDEM= 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=CD4V2d+y; arc=none smtp.client-ip=209.85.221.52 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="CD4V2d+y" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-43624d7256bso1127358f8f.1 for ; Fri, 06 Feb 2026 02:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770375195; x=1770979995; 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=1WmKsY8ayiw3/jo38sqRg0fzRnMmAiOhgs/UG6PFaCM=; b=CD4V2d+y5SBJELR8ZCbUSvJxPUtpp6Y2LQAwrYg0CT7MJb5TLfOnRUBYD+uXBAiFdc 4P2mrNAYsWsjhBh0ffFhDh9sE8lAUPp8bfjXG9u01LCj/iN1Jd+g9K1I1pYSsce0FRx7 ASGDQ9z32sjicKtQqQEfa7QpNvex7BcXdDq5msE7ojcVLEYBnAoHSlnJ7biKxzlU0NNA 9yb9PetWRHHP83+YDehves7yJY6ZwoJLkU3T8NOWrLXeyOPq1ceEZO9fsXlYCmekSKSj ElP4B4/zGgeJIdnNRb+RxBSY61O8jJw9tjncNtIGuuWPYhmnSa3ENrRfjgJiX63+pDBE RiSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770375195; x=1770979995; 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=1WmKsY8ayiw3/jo38sqRg0fzRnMmAiOhgs/UG6PFaCM=; b=wFuyvR3gJs0lIBaxDhFTDN82TzjVls53dMlnwGtRwTsRUp0RFUHeznjy11+b0qRyEE S8r4l+pHFE1hCdqsHu+kkfHOXeTtC+zd0hRftpYL/VJfqxI1wAR4E8ENDfyl+Khgneug 5CvCbdNrRNRFezlqWCCb3r/uMMwXuUXdY9vzuzST6s8xgfjApOU9OIQ8NWlfdKC79rAD s67n8Qdav3LNoz/jbdLNuLQsFyxm0dvQGjwxl+nTi1WB+irS3CxlNKCOyY7VPenvVayt tVc643J4aZOaZkBbqW3C/qCJpkdluP98L+SpueRPZto/6Lyq2W5zvJ6phYee3YcYytm9 86kA== X-Forwarded-Encrypted: i=1; AJvYcCWoH5Xb/Xd6W5/GgQiA1csLvVid2ALHxWY5xZF/S6cJjEgDcKjn2/Xef4EzU30NtOnneyUM2Zmuy0raswI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxvzx2/H7bkx8XqoWewGG7i1FAqyP846FuarNFRqFNLO9UBq/UV /MOpW9FCMN9/Dm6AuLMlYOADH33p/v8rRSVKtsMpuDxScE9KJgNqx7wx X-Gm-Gg: AZuq6aIdtqd47g7rwEHv7VB4xXFiDFVae1bNfziW9t3OmsBI+qPqQQ6S3IvugR1SkP8 p+LWVCXRq3FZz2Q0WYgsnDt+G5b1IQSEyGyrrpEiLrfqmUU+53gq1tuu8fp6m4kmMDQLviq+Utf /cJJRo9db2dNPMNwMLqJ89PB40mBMVDqrlAR5Qsa2HNB0mWCsicZnIvzmSCL6+94enE/MJxjaWJ Vxj4oMadOhc6VL9FG2b7O6K3Pxc53IE9nyJLT+WAIOKEK9MKxpwQbIF1sKIBWPWylk66YYYbb+6 DyhtxZuHQbj9ZQIxyZwJyUmcGKlNXaaCCWNbtIMqUJ+f8DFLUU+KJ6xjJ/8W0ZXhvtVPnSuhUVh ZdlJGqgMWMvMdVzItH3N4nZaZakzbczzlWpCWhfX92AITh3rzB/cAl+FUlSbQlJxH7iwoUobaRs YZ1AqOZIsol0YfvEe48Q== X-Received: by 2002:a05:6000:2c05:b0:435:9f1b:8d19 with SMTP id ffacd0b85a97d-436293889f5mr3853188f8f.38.1770375195145; Fri, 06 Feb 2026 02:53:15 -0800 (PST) Received: from biju.lan ([2a00:23c4:a758:8a01:1e64:f8d5:9d7a:19d4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43629730992sm4519611f8f.21.2026.02.06.02.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 02:53:14 -0800 (PST) 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 v4 2/4] clk: renesas: rzg2l: Add support for enabling PLLs Date: Fri, 6 Feb 2026 10:53:02 +0000 Message-ID: <20260206105312.231015-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206105312.231015-1-biju.das.jz@bp.renesas.com> References: <20260206105312.231015-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 --- 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 945e31c8f161..7e569a7c8fc2 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/stanby 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 1db413bb433d..7de4cb7af1cc 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 Mon Feb 9 02:42:39 2026 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 4FED43939D2 for ; Fri, 6 Feb 2026 10:53:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375197; cv=none; b=NdIidlQxUTnFO55+71Kf9RWuQg5te/Fas32OyYDw7c73gFpxvRT55vptOJgRwhsTwPGnebvZ5x/ItRHBy2gaEReCxTVbW7q2gU28utIFJbXCoKdaPDKTIqSQESubGjImHGr9PAEI5uASdjPvzKeQQ4gzB+uqlQe2WeZ+El0tc7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375197; c=relaxed/simple; bh=CxSA0nLdfhGStJVuX0JIuUriZDiySdc1TRoiDS7cHr0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SISHr1WNrLocHSbwvsO4a5VuL96MS0ntvYOtyiT+IYAZSHkAozQevvRxCVRQwGEEbvdqAwOmbVqGNZM3AJcgogg/ba3a19ymHxTROUaJnFK9g6wUiReoJ9SyLO3S7UhqcrVg3Ye3Nn/x6cdw4+80qpUtgSOwXBvrs/nLTwTvl1o= 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=Zj/18Yet; arc=none smtp.client-ip=209.85.221.51 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="Zj/18Yet" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-43596062728so2133352f8f.1 for ; Fri, 06 Feb 2026 02:53:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770375196; x=1770979996; 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=WOrUlUstDWEoH39uM2uD3wDhNZIm6BCgL8Fz/zS2n3k=; b=Zj/18YetFHUxd8RaC66ytKyswtI/lXmXEKOuZHIS3QzSmr8t1KqvfOWPywTMulieXv KDyFeKABWqBv2nNxmPm06gEdKnlf14ZO2hsr532dZQaLQiuyOxWG6Bpkyp4zmbP7VMtE kJ40++9KkMuT5jBwvqz3CSbGxb3ikWvgSp4wYgfqS005JOUwdmwptEVApGrD5S3cAcad dfGHCjuiATL3zBeKMVOPfAsL6/LrvlGkbknBfkhJ9jF4RExXpogr8FzMmUhRe3DxUG6d JxCTURiXpPskgMD6k76AsnNBDu7HmcEHNczEEB5sBfUSdJHKZd7ZMH8zjO7MRS1eapYA VQ6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770375196; x=1770979996; 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=WOrUlUstDWEoH39uM2uD3wDhNZIm6BCgL8Fz/zS2n3k=; b=WQhkNk8hPTLfBYTurUv6Unqw5rb6D896z2OANJRJWDvkksjs0ptiuvTTT73u9Ra9EJ 0x9K/6VGQSevGMhEDOk0Hw6fzI9e7T47Ct9gOJkHkTHyinUge1GS2qutC6bHQza/P/t1 CEGyS5SO6M/dVXYHBD7rgS+d0vvYyL7uGX2aG8kkNB5k5qAogtAQ06w+Oe7DMyg4BhFB YagPaDkVmzTO+vCjRorOAgrzITrVyi0gVNEkGLYKXm9mqEaP8/08LwWkGgyFjUdA9x5O 5ihSVuOoA04o8QW9OI7qcCiK50hTAlJcmSV0mEDHfM+dRs8P/Ypne2enM8MfvJ7hdr2o /hpg== X-Forwarded-Encrypted: i=1; AJvYcCWxuekwkq0YLpLCku41EcB5Y6+ZQxOhyqsP1voi/Jt9roOnyb/20mpRJFqVNWfEEqY+2qaQko8yYtlYygo=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9ykH75w5RYDskOemGHHWeTk0Sctef2JNi+gU+GzJ0qc//Vef0 SWEUmbfPkiY3BnWlyngDosUYFxSQfmW2yD69nFrFYIB4Qq9qhbiy8ZL2 X-Gm-Gg: AZuq6aJAQ0iHVqRSkKh74gIM3k4+9N+G2b/++M9UrYpNzGbcoi/FsKLf2+rumvBL2Ra 5EN0oWSB8TbUDlAJ1CJyVPb8qm3CqVgnIJTv/nD/Pa26oYwIt5Tkvr2GlAMU3H3icgp/tFrRdva aATX031HjPw55O3VlUWMoUfXMo55NGOojiKk9zIzt5DeNdrllVGkfA1cPRu6CQhHOsB9VDvDTg4 Vv1ZyGtlnhfV9ujLw/0Z3x223nAVW38E6PYPRoDFHzgK+/+JveGvdDe+R2Wu7f+/mQlXekIyy/J kC/gfNsyw5C+j8L9SktEAQpDU3XDuNK6/EaZh5UTkg/liRKizMpJfHwBl4wumt9XQQQCEB6XFjj Galvy9XxSK9A1+xGYrg4boAzAWNXHT4yzg1iRWsi0LjS5JDVLtiIdEwr5vLXSly545uGcUqgoU3 s0CxzBu388HLYWFwqJrA== X-Received: by 2002:a5d:5f55:0:b0:435:8dd5:ad4f with SMTP id ffacd0b85a97d-436209964d4mr9282945f8f.9.1770375195677; Fri, 06 Feb 2026 02:53:15 -0800 (PST) Received: from biju.lan ([2a00:23c4:a758:8a01:1e64:f8d5:9d7a:19d4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43629730992sm4519611f8f.21.2026.02.06.02.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 02:53:15 -0800 (PST) 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 v4 3/4] clk: renesas: r8a08g046: Add support for PLL6 clk Date: Fri, 6 Feb 2026 10:53:03 +0000 Message-ID: <20260206105312.231015-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206105312.231015-1-biju.das.jz@bp.renesas.com> References: <20260206105312.231015-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 --- 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 d77934872cf4..cc7d3872e9e4 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_CLK_P4_DIV2, @@ -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 Mon Feb 9 02:42:39 2026 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 37072394490 for ; Fri, 6 Feb 2026 10:53:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375198; cv=none; b=soDdWBbWMwo0N+POBDexLh09K4605vgUw2XXJx8/BB3MbBiibA++Ho97EtL75sBTtwpL1C7+r3rD3lpOa5l/QtKzFtccdu4OP5GYUtsvtslOaKWXrcPQqKuA3GWHnNO9hWwyEtAZcMlKQ9+nIm6Oha5ZjVJClxlMWrNoaLfhUSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770375198; c=relaxed/simple; bh=E9ZSHnXD9X7MjILgNxfvajPskWPb1at5SAQIVrXREt4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bDOI2SN67tOceErgr/yAMx773IAJEcxRJyaPdIBRc+F//54sVCe73+FTItY/VIo4KzWdSqwMPbR+VdH4L6SNHHnLzVdyeKPpiKFpCH1Z+vFqwtWotGhyVyhZwz03ynvi+6/b8zBMZG87+TtVqCKYCJVTwIVtua/W7dBKQDKuvDU= 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=gcl0nEUy; arc=none smtp.client-ip=209.85.221.43 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="gcl0nEUy" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-4359a316d89so1626765f8f.0 for ; Fri, 06 Feb 2026 02:53:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770375197; x=1770979997; 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=gEkRY/D1XR9iy/Ym0Sp3clSObcwfcfjO4JrebWZ4vME=; b=gcl0nEUyf7HZ9QSgztKABmncZh13GM2hR7Zoo2PpmdivFTPTwQKkQCZNQJ7LvlzFLz PveI7J5bcRcAI5hjeOYljX9cV9ogPBIH+GpBQBWFDMKOBSxKFWYU2hKHIOjGAkyvKxXT FFoch5BioU44byuawUHva9qcjgkFzlfGL8LCvrSmqSaM34i2ZQbQsgKhwm9RTvJ2eNZG kjuOgDS5LcZHvaWM5wcDUKpui8o0hx+CubsBE9WH9N9Hbr819wrU3HuvL4gSadNCuWux meRstyqo2QioNN+I4+igWqFyxglz0fgzS5MNiYhBMhYjuX986SAiZMBtmIXfwpTPO/ny 5Q+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770375197; x=1770979997; 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=gEkRY/D1XR9iy/Ym0Sp3clSObcwfcfjO4JrebWZ4vME=; b=lxh7iVGQfeAzMw9avjkXFfkAP3cE08MJQE+1WKW/NhrjCoZmGjSwTfhY1RS6ryerCc g9Y4yH9iimxN257B0PmlxGYTlqqmGAF+2SyGgoS5emBdufxDn8NfeYVlJjg76xNz7g0B h9SizBnPFtSqcKTMdqUnnsHxFCbT1Oef1zt5vC/gvNrl4XjGAjO2XGYtEfcZcrXB5ItZ CR5r5tfjrzwr+JoUUfimKFW/M+wEvVoTRI7m4eI1AeuC48ZdCGQnkPp5+WDNzJeb19+c 2S80IMuCFyRZkOM3T23Aa75aA1qCWMfVuD0lS64BJTx4pbRfpd2GtcN1wZASgYilFoLh UJxw== X-Forwarded-Encrypted: i=1; AJvYcCUH8c1lXuMs1UUGcB9Djwjw5ucX7HcABS1haqcpoIFwaqTHARkYScW+b4mKgMBGIg8y7Bib7Wi/duR6/lI=@vger.kernel.org X-Gm-Message-State: AOJu0YycpU3viPfuH/pAzH/kyj0xi3iDNkBJVTKwxfOfhZ8aKCKQYCuu 0MN4LdQlEhiaI0Ys8XRhnaUPS0AkNwA01ff1Mec/BxMhv3EjH4rhHpM3km1REALn X-Gm-Gg: AZuq6aLbx65Vx6gcbQtIo8LDH2NN9g1xO0eBTnpFDjx1x5XBbsp5Y1Js2LQXolPZY4d pv390glLMCHCThf9WJnNieS1ZjsZR6aAw2G1335P7Jcn8uie5G+zYDlOffY8YTmyJfM0ttPAeUn 4bs8JD/Z60njf4vd/4NKqz2u6qXCl42yIjzJ8RfgAk9LOffC7XEXlBY8PAwefjbXRxe/px8jzOY a6rRxrc/OMp/C7FHXQaxaUjROKZFLMXf7EoR5dQuZKIzhqDMXubVBtSv7vgo75ahOV/h7osr34a eAi39YRfL2V//ERW/fHqr3MPaxjcj1wUphpeX3AlikuHihbzimMQ65C6DbjvUHAy78rCzUylPrG iaVYfDp3LiwvWtpUue8row+l9PUYuNecJXWMWzUWvhcyRKO9Fd4Pe1RMxjpxLGwQGpVLLKWHthx XWUilMEa/8vSbWLjP0NQ== X-Received: by 2002:a05:6000:2c08:b0:435:a48a:123f with SMTP id ffacd0b85a97d-4362937b167mr3949418f8f.42.1770375196522; Fri, 06 Feb 2026 02:53:16 -0800 (PST) Received: from biju.lan ([2a00:23c4:a758:8a01:1e64:f8d5:9d7a:19d4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43629730992sm4519611f8f.21.2026.02.06.02.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 02:53:16 -0800 (PST) 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 v4 4/4] clk: renesas: r9a08g046: Add clock and reset signals for the GBETH IPs Date: Fri, 6 Feb 2026 10:53:04 +0000 Message-ID: <20260206105312.231015-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206105312.231015-1-biju.das.jz@bp.renesas.com> References: <20260206105312.231015-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 --- 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 | 147 ++++++++++++++++++++++++++++ drivers/clk/renesas/rzg2l-cpg.h | 6 ++ 2 files changed, 153 insertions(+) diff --git a/drivers/clk/renesas/r9a08g046-cpg.c b/drivers/clk/renesas/r9a0= 8g046-cpg.c index cc7d3872e9e4..4819da66199f 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, 2 }, @@ -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_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_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,50 @@ 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 +241,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 @@ -126,6 +252,23 @@ static const unsigned int r9a08g046_crit_mod_clks[] __= initconst =3D { MOD_CLK_BASE + R9A08G046_DMAC_ACLK, }; =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, @@ -142,6 +285,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_LVDS_RESET_N + 1, /* Last reset ID + 1 */ diff --git a/drivers/clk/renesas/rzg2l-cpg.h b/drivers/clk/renesas/rzg2l-cp= g.h index 7de4cb7af1cc..9abb53483759 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