From nobody Sun Jun 14 02:38:03 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 B33FA3DEFF0 for ; Mon, 4 May 2026 14:45:28 +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=1777905930; cv=none; b=nUi9xaeNppGyrq35D1KCfBqVttfXcuHLSBLO04yXfgp1Cedwx1jGPN8EAX/7AYLOrFyvl2ZAeoaqjHHj7DsQsf1T17GnzHTU3+jKb/06g38vm7TiyHUenDBlGxvNEDD69VBkifnJvsm+87lr6BS2PRzw3Tn6YsDsG010CopRqqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777905930; c=relaxed/simple; bh=S4XEGtlNjs4KB5nnF1CUR8Rj9qdHG0xcI+F14IrksYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AT6KkKjYGTsuwQuP9ur8DnXmUOCR3QGK52J5YcTxkqgqg6rOBxKKgp3aBrHGCTuY6Ea8s0OV38CEDlhCLy6lhC89NetI+JaoHqd1WNwf3/IeueBT0XsZnRcoOkY+rzyWoOHbsp0aEMAMLjINUGte7oU9GL6vfkOqPdBosHYO2zg= 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=DVsX76bA; 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="DVsX76bA" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-43d73352cf2so3754412f8f.1 for ; Mon, 04 May 2026 07:45:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777905927; x=1778510727; 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=NE4Gzu5dGAIOYMTkBgHkZPHEG0/JctFS3nbLSj6XV0w=; b=DVsX76bApjsIdq8RgiTz/ErCXxVY/OR8ldBAdr6acBEADa/bM4fAv/tIuSVlv6yUSe qI0zsLcQph81QEMgN0oHqe+ljSqqnT/fR0+OVR5knc6mBF/rRXsG8JIkvHJxC4wNgj0O f9QvWxincoLwU/TeoyYLy9Pl6kL4vWcAJK6wdnAuWntjRop2yeRSzkS28MPvqrau0a0b 7f8GaFuGLId6A+pN9IXJsBv02DXBJNRe/wbVpPzOKcCQe1TfCgUNyR55gsQQhLNtiRwh CjsfT9yYPpXinvl3sLLm4TDDn2SwzgbmC3o3x7cAjyLEymL2+DeFj+KcgaRn/uVl7mR9 eBUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777905927; x=1778510727; 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=NE4Gzu5dGAIOYMTkBgHkZPHEG0/JctFS3nbLSj6XV0w=; b=rKXIlcnU6HipCIB+PWMFmWr3bo0ixMHRBL5OgP8vjuc5sEFp1crJVa88ieKPgaTcdL WtzBOCGTwfXcWObcV1QelctndG/gDZ1+x2hQKuMbvjulIxaRKsY9T693ddfeQfrlmXY1 bso6PBC9y2/JsUTITYjwyIgRqHLO4iLBjie0pLGAjB0fM2Ro/patM1m9mUUnoLHevUx8 XYrqd/sWqn+6O5CKC39mJfuG0ftI0KtpegjZ5xMDWjHnohSyGPYwSCjCtEGqaPi6Kg7S Ak874Y5VLRNXhCMyrrTVNUnsV4Q8PW11jXrOIaWdS+cpNcPslZaTRmcyByxb92Gn5MFc /VPQ== X-Forwarded-Encrypted: i=1; AFNElJ+R/CgaQVWb0X77DYbVzUUPmHmyw3Q2qyA7kXE0VBKpJFISz0Kjkg9IjjMZvVm7hPupORgW6hYY4vX7Wzs=@vger.kernel.org X-Gm-Message-State: AOJu0YxoyRCW/03zrEiph2KIMj6BaX9Rb6EOP+HR35tiDFckGMmFlvbX 1Rx9bSgIX5/Ts48rOBc8wYujmx9MMJNlMVwk0RSR6WRrkGbGSlTf6R12 X-Gm-Gg: AeBDiev4XO1nkAaeBwY4z0O51rVufoea0zoOR+uSybVBmRbkV1Bc3Xks+EbKmES+htK QUXEdXK5PgfZzcQu5VESSd7RTJOEeAJWo1mu7KFYhqfiTwX0OHK7Bn5ZsbjoMewDv3FMFi5wLp8 fGfhhgRtLyuozYjU27dQXwJ7xEif8jBf01ZjIjwPbXzbDJeC5HFkC4GLrlTF2SaiKT7tT0sMA10 AUinxiF0XyiJj5A35ReGoxsyn74qkILcVL/FYQFcc13TQf9MQXINQ/CXZF5wMpqbOrDyxJKYzz2 BkXSxJCJZgHirBuxzsnfhkuNGzv9+42zZY3uTNb/7q+iYwOd5NFEAF8KnwuxzsTYxEl8sBgEitC 7QWDKumih3nNoPqGekYRLY8tRF4EoBfNs5oRjOyZmYIh1Q3vl90U9WMHuF7dsAjbxstfm61tJAE KzKE07tuSFAQkDcXIVYILThkqcFexzXM1ItGrr3FP1//qx21dh1qH7HJBSxT8= X-Received: by 2002:a05:6000:228a:b0:43c:fd7e:72eb with SMTP id ffacd0b85a97d-44bb6ab1cb0mr15924375f8f.41.1777905926793; Mon, 04 May 2026 07:45:26 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:6444:b23f:58b2:338c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-44a981defa6sm24371239f8f.24.2026.05.04.07.45.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 07:45:26 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd Cc: Biju Das , Brian Masney , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH 1/3] clk: renesas: rzg2l: Simplify SAM PLL configuration macro Date: Mon, 4 May 2026 15:45:17 +0100 Message-ID: <20260504144523.153906-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260504144523.153906-1-biju.das.jz@bp.renesas.com> References: <20260504144523.153906-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 Replace the PLL146_CONF() macro and its associated CPG_SAMPLL_CLK{1,2}(n) helpers with a single CPG_SAM_PLL_CONF(stby) macro that takes the PLL standby register offset directly. This removes the implicit coupling between PLL index n and register layout and eliminates the now-redundant GET_REG_SAMPLL_CLK2() macro. The RZ/V2M PLL4 definition is also updated to use the new macro with its explicit standby offset (0x100), removing the local PLL4_CONF define. No functional changes. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven --- drivers/clk/renesas/r9a07g043-cpg.c | 2 +- drivers/clk/renesas/r9a07g044-cpg.c | 2 +- drivers/clk/renesas/r9a09g011-cpg.c | 7 +------ drivers/clk/renesas/rzg2l-cpg.c | 9 ++++++--- drivers/clk/renesas/rzg2l-cpg.h | 6 +----- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/clk/renesas/r9a07g043-cpg.c b/drivers/clk/renesas/r9a0= 7g043-cpg.c index 70944ef8c5b8..59d6ee2e888f 100644 --- a/drivers/clk/renesas/r9a07g043-cpg.c +++ b/drivers/clk/renesas/r9a07g043-cpg.c @@ -103,7 +103,7 @@ static const struct cpg_core_clk r9a07g043_core_clks[] = __initconst =3D { /* Internal Core Clocks */ DEF_FIXED(".osc", R9A07G043_OSCCLK, CLK_EXTAL, 1, 1), DEF_FIXED(".osc_div1000", CLK_OSC_DIV1000, CLK_EXTAL, 1, 1000), - DEF_SAMPLL(".pll1", CLK_PLL1, CLK_EXTAL, PLL146_CONF(0)), + DEF_SAMPLL(".pll1", CLK_PLL1, CLK_EXTAL, CPG_SAM_PLL_CONF(0)), DEF_FIXED(".pll2", CLK_PLL2, CLK_EXTAL, 200, 3), DEF_FIXED(".pll2_div2", CLK_PLL2_DIV2, CLK_PLL2, 1, 2), DEF_FIXED(".clk_800", CLK_PLL2_800, CLK_PLL2, 1, 2), diff --git a/drivers/clk/renesas/r9a07g044-cpg.c b/drivers/clk/renesas/r9a0= 7g044-cpg.c index 2d3487203bf5..913cca6dd46f 100644 --- a/drivers/clk/renesas/r9a07g044-cpg.c +++ b/drivers/clk/renesas/r9a07g044-cpg.c @@ -159,7 +159,7 @@ static const struct { /* Internal Core Clocks */ DEF_FIXED(".osc", R9A07G044_OSCCLK, CLK_EXTAL, 1, 1), DEF_FIXED(".osc_div1000", CLK_OSC_DIV1000, CLK_EXTAL, 1, 1000), - DEF_SAMPLL(".pll1", CLK_PLL1, CLK_EXTAL, PLL146_CONF(0)), + DEF_SAMPLL(".pll1", CLK_PLL1, CLK_EXTAL, CPG_SAM_PLL_CONF(0)), DEF_FIXED(".pll2", CLK_PLL2, CLK_EXTAL, 200, 3), DEF_FIXED(".pll2_533", CLK_PLL2_533, CLK_PLL2, 1, 3), DEF_FIXED(".pll3", CLK_PLL3, CLK_EXTAL, 200, 3), diff --git a/drivers/clk/renesas/r9a09g011-cpg.c b/drivers/clk/renesas/r9a0= 9g011-cpg.c index ba25429c244d..a99ab1375f07 100644 --- a/drivers/clk/renesas/r9a09g011-cpg.c +++ b/drivers/clk/renesas/r9a09g011-cpg.c @@ -16,11 +16,6 @@ =20 #include "rzg2l-cpg.h" =20 -#define RZV2M_SAMPLL4_CLK1 0x104 -#define RZV2M_SAMPLL4_CLK2 0x108 - -#define PLL4_CONF (RZV2M_SAMPLL4_CLK1 << 22 | RZV2M_SAMPLL4_CLK2 << 12) - #define DIV_A DDIV_PACK(0x200, 0, 3) #define DIV_B DDIV_PACK(0x204, 0, 2) #define DIV_D DDIV_PACK(0x204, 4, 2) @@ -131,7 +126,7 @@ static const struct cpg_core_clk r9a09g011_core_clks[] = __initconst =3D { DEF_FIXED(".pll2_400", CLK_PLL2_400, CLK_PLL2_800, 1, 2), DEF_FIXED(".pll2_200", CLK_PLL2_200, CLK_PLL2_800, 1, 4), DEF_FIXED(".pll2_100", CLK_PLL2_100, CLK_PLL2_800, 1, 8), - DEF_SAMPLL(".pll4", CLK_PLL4, CLK_MAIN_2, PLL4_CONF), + DEF_SAMPLL(".pll4", CLK_PLL4, CLK_MAIN_2, CPG_SAM_PLL_CONF(0x100)), =20 DEF_DIV_RO(".diva", CLK_DIV_A, CLK_PLL1, DIV_A, dtable_diva), DEF_DIV_RO(".divb", CLK_DIV_B, CLK_PLL2_400, DIV_B, dtable_divb), diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cp= g.c index 03658ba012ea..c6f9f3417ce9 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -58,6 +58,10 @@ #define RZG3S_DIV_NF GENMASK(12, 1) #define RZG3S_SEL_PLL BIT(0) =20 +#define CPG_PLL_STBY_OFFSET(conf) FIELD_GET(GENMASK(23, 12), (conf)) +#define CPG_PLL_CLK1_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0x4) +#define CPG_PLL_CLK2_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0x8) + #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) @@ -72,7 +76,6 @@ =20 #define GET_REG_OFFSET(val) ((val >> 20) & 0xfff) #define GET_REG_SAMPLL_CLK1(val) ((val >> 22) & 0xfff) -#define GET_REG_SAMPLL_CLK2(val) ((val >> 12) & 0xfff) #define GET_REG_SAMPLL_SETTING(val) ((val) & 0xfff) =20 #define CPG_WEN_BIT BIT(16) @@ -1123,8 +1126,8 @@ static unsigned long rzg2l_cpg_pll_clk_recalc_rate(st= ruct clk_hw *hw, if (pll_clk->type !=3D CLK_TYPE_SAM_PLL) return parent_rate; =20 - val1 =3D readl(priv->base + GET_REG_SAMPLL_CLK1(pll_clk->conf)); - val2 =3D readl(priv->base + GET_REG_SAMPLL_CLK2(pll_clk->conf)); + val1 =3D readl(priv->base + CPG_PLL_CLK1_OFFSET(pll_clk->conf)); + val2 =3D readl(priv->base + CPG_PLL_CLK2_OFFSET(pll_clk->conf)); =20 rate =3D mul_u64_u32_shr(parent_rate, (MDIV(val1) << 16) + KDIV(val1), 16 + SDIV(val2)); diff --git a/drivers/clk/renesas/rzg2l-cpg.h b/drivers/clk/renesas/rzg2l-cp= g.h index 33f54ba0e64e..17ec6f285c21 100644 --- a/drivers/clk/renesas/rzg2l-cpg.h +++ b/drivers/clk/renesas/rzg2l-cpg.h @@ -58,11 +58,7 @@ #define CPG_CLKSTATUS_SELSDHI0_STS BIT(28) #define CPG_CLKSTATUS_SELSDHI1_STS BIT(29) =20 -/* n =3D 0/1/2 for PLL1/4/6 */ -#define CPG_SAMPLL_CLK1(n) (0x04 + (16 * n)) -#define CPG_SAMPLL_CLK2(n) (0x08 + (16 * n)) - -#define PLL146_CONF(n) (CPG_SAMPLL_CLK1(n) << 22 | CPG_SAMPLL_CLK2(n) << 1= 2) +#define CPG_SAM_PLL_CONF(stby) ((stby) << 12) =20 #define DDIV_PACK(offset, bitpos, size) \ (((offset) << 20) | ((bitpos) << 12) | ((size) << 8)) --=20 2.43.0 From nobody Sun Jun 14 02:38:03 2026 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 5036E3DEFE2 for ; Mon, 4 May 2026 14:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777905931; cv=none; b=XnraWVV93jnUCd6tKE7eo21tj4yIPSz3iN/QxuBULj/JOb4Kgn6l0qLhYGwhT8z45rlVaSQG5+Z5YdpUEi5EDfzmO/jGCOUEakRFELM4Ay4txymbtYXqsOH/LFu7PMRmN88H1WRd0vPCGTFVx04krKm/XPXIGy97LaQfSM4NcDA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777905931; c=relaxed/simple; bh=IuPuNT0iWwufeeItnNYuVUA1dN8Pvp00SEXIeDTiV0g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZnNX3qpvCXNAz1yVdhYGXRT5297YDl93dx1wOjI711wopsPLKszDjTBeUr56QUl0EWJN5ry5sVQZ96ofWkz38rNdYbAIlewmEKuZFHus5wgl9tMfNPofmkjuVv/d0gSlvzXhq3C9yplQAej4/GbyYZae+0GE20UHkG0UGfl3FHc= 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=FYpxs5Uc; arc=none smtp.client-ip=209.85.128.46 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="FYpxs5Uc" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-488d2079582so45568375e9.2 for ; Mon, 04 May 2026 07:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777905928; x=1778510728; 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=X5fkkKuXHHDwakN2Kt3vbnokuaWWi6ricw4daqx44Ro=; b=FYpxs5UcX1THOKjpk/RZYZB1KPAb2XaPtY5t82ilvKWkBpyFr01qW1G1G4Vn+i98qb CDvyxjCn0yxLaiUff1SHCg8uSFSkCppiAucbcmXSKgWWRWAyMlOTQ8tl4XbY8d9D3Zcz LMI/g1BoOmas5hICsjoebSlUkiZtgoQRtcPbEywM1E81XNzJ/UDWRNUCpD2TUKzBsuN9 /G4xpbWwE0gigs0I7oVlaCTQCT5XYqwoCH3qmBOLMTnx+fHPW2x+6GFNFiWTfeq/g26p MkFdzq7PDJujMBuRMtzJPAimiwtblvEoVT6gZALtqmi590+ZtCRVRsOHagX5W19l/+Wy 6Amw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777905928; x=1778510728; 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=X5fkkKuXHHDwakN2Kt3vbnokuaWWi6ricw4daqx44Ro=; b=qfUUrhdToRDg+pnrK6lu2N6BAikgj0qw+vSxtVycJfdZ91cFa/TVOpCsOy7yopEhNN L8Lml1dCIPD40xitlH/+Nk4VyqBzVapXVRxUJlAx0prSJLLwhXV0rsLzNXRJV+4u1Gl1 k7aR+hwZPxLHhiXkU8WxFJyxkBzzKbkUvDhOTGpKPCDGqG184sz9JoGS6aiR/iQgizcA mkITqI+VQ6JxxH9vmOCxwFGjFSVISeT7zXOmOY4rXNbSknoym5ODzPL5EZTPoyGLGNUN sW//uxNRews/iont8Ulnp0wCKNS3GuQkaed4l/sNJdvzx40+zL0ikl1/RLgzBYaJSIcY 14Cw== X-Forwarded-Encrypted: i=1; AFNElJ90e7fAmznN6vLO5ckxu+p2+b4/v5uusj31WgxSK2vAFRYrYR93Dvj66Ncz/B0FB+MZS1/raa3i7yGGH50=@vger.kernel.org X-Gm-Message-State: AOJu0YzemigSbdigj0QGbIhd4hydR5hRyAbI4Uq03yGY5GXbXsUs5Hsu 1QnpDReUjCeVpkZIakK55xl2dMlvfoAm0UxrtM61okk8L2uNt0EqJGjc X-Gm-Gg: AeBDievzDUZDqkSOFbmk8tFLjzqTfbWLV5vtLr4Wi1Ubco79DnwAxqEsPZKl1FBlLCk CdBerwaNtu3QcU00sTh04wbcy44CfRd5O7yQErBm79YoqWbZ3W0vUzw8DLBVQVfRYV3JemMrX50 uiobNWwlXCkj5/YDaNHNwRK+VFRwyooafCNQA83Z0b9UeU+1r52NNfyrTlgm51eZNJBoApSVeyd Gp4mnWuUTIMYvAUZXtOHQrGmJ1fgLGnTncP78Lguvm5jLhngwUWsb9w5ik/ckFK/DnM167nxHMV mzsvUGmZKLLMuZmd0ubIlDxEfrPa6uKs45aBI1Kipo+SrEnrcSN0DB6w2Fg7hgXnMUrmjp3yi3+ 14A1tZRx8kNELuWenjKa5gJ26chtorhf/hlLW67cpGsKbBamban4XNlLgM5KZdjrBdrCNEQeKWj nJk2A/NlHZcpYexmMTPE5yCqQwe9nG177YWogvlCnJ18PTnfpWVwwzdWTjqsWba8QCE5ZlbA== X-Received: by 2002:a05:600c:c170:b0:48a:80cb:1bb4 with SMTP id 5b1f17b1804b1-48a98671d52mr158941185e9.22.1777905927533; Mon, 04 May 2026 07:45:27 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:6444:b23f:58b2:338c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-44a981defa6sm24371239f8f.24.2026.05.04.07.45.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 07:45:27 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd Cc: Biju Das , Brian Masney , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH 2/3] clk: renesas: rzg3s/rzg3l: Simplify PLL configuration macro Date: Mon, 4 May 2026 15:45:18 +0100 Message-ID: <20260504144523.153906-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260504144523.153906-1-biju.das.jz@bp.renesas.com> References: <20260504144523.153906-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 Replace the per-SoC G3S_PLL146_CONF() and G3L_PLL1467_CONF() macros with a unified CPG_PLL_CONF(stby, setting) macro defined in rzg2l-cpg.h. Drop the now-redundant GET_REG_SAMPLL_CLK1() and GET_REG_SAMPLL_SETTING() macros, replacing the latter with CPG_PLL1_SETTING_OFFSET() using FIELD_GET() to extract the offset value. Update RZG3L_PLL_MON_OFFSET() to use CPG_PLL_STBY_OFFSET() + 0xc directly. No functional changes. Signed-off-by: Biju Das --- drivers/clk/renesas/r9a08g045-cpg.c | 5 +---- drivers/clk/renesas/r9a08g046-cpg.c | 7 ++----- drivers/clk/renesas/rzg2l-cpg.c | 11 +++++------ drivers/clk/renesas/rzg2l-cpg.h | 1 + 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/clk/renesas/r9a08g045-cpg.c b/drivers/clk/renesas/r9a0= 8g045-cpg.c index 1232fec913eb..9610676058de 100644 --- a/drivers/clk/renesas/r9a08g045-cpg.c +++ b/drivers/clk/renesas/r9a08g045-cpg.c @@ -50,9 +50,6 @@ #define G3S_SEL_SDHI1 SEL_PLL_PACK(G3S_CPG_SDHI_DSEL, 4, 2) #define G3S_SEL_SDHI2 SEL_PLL_PACK(G3S_CPG_SDHI_DSEL, 8, 2) =20 -/* PLL 1/4/6 configuration registers macro. */ -#define G3S_PLL146_CONF(clk1, clk2, setting) ((clk1) << 22 | (clk2) << 12 = | (setting)) - #define DEF_G3S_MUX(_name, _id, _conf, _parent_names, _mux_flags, _clk_fla= gs) \ DEF_TYPE(_name, _id, CLK_TYPE_MUX, .conf =3D (_conf), \ .parent_names =3D (_parent_names), \ @@ -134,7 +131,7 @@ static const struct cpg_core_clk r9a08g045_core_clks[] = __initconst =3D { =20 /* Internal Core Clocks */ DEF_FIXED(".osc_div1000", CLK_OSC_DIV1000, CLK_EXTAL, 1, 1000), - DEF_G3S_PLL(".pll1", CLK_PLL1, CLK_EXTAL, G3S_PLL146_CONF(0x4, 0x8, 0x100= ), + DEF_G3S_PLL(".pll1", CLK_PLL1, CLK_EXTAL, CPG_PLL_CONF(0, 0x100), 1100000000UL), DEF_FIXED(".pll2", CLK_PLL2, CLK_EXTAL, 200, 3), DEF_FIXED(".pll3", CLK_PLL3, CLK_EXTAL, 200, 3), diff --git a/drivers/clk/renesas/r9a08g046-cpg.c b/drivers/clk/renesas/r9a0= 8g046-cpg.c index 0004b9516fdf..0657dc01ff8a 100644 --- a/drivers/clk/renesas/r9a08g046-cpg.c +++ b/drivers/clk/renesas/r9a08g046-cpg.c @@ -56,9 +56,6 @@ #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) =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, @@ -154,11 +151,11 @@ static const struct cpg_core_clk r9a08g046_core_clks[= ] __initconst =3D { DEF_INPUT("eth1_rxc_rx_clk", CLK_ETH1_RXC_RX_CLK_IN), =20 /* Internal Core Clocks */ - DEF_G3L_PLL(".pll1", CLK_PLL1, CLK_EXTAL, G3L_PLL1467_CONF(0x4, 0x8, 0x10= 0), + DEF_G3L_PLL(".pll1", CLK_PLL1, CLK_EXTAL, CPG_PLL_CONF(0, 0x100), 1200000000UL), 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), + DEF_G3L_PLL(".pll6", CLK_PLL6, CLK_EXTAL, CPG_PLL_CONF(0x50, 0), 500000000UL), DEF_FIXED(".pll2_div2", CLK_PLL2_DIV2, CLK_PLL2, 1, 2), DEF_FIXED(".pll3_div2", CLK_PLL3_DIV2, CLK_PLL3, 1, 2), diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cp= g.c index c6f9f3417ce9..7e5173a37f3a 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -58,14 +58,15 @@ #define RZG3S_DIV_NF GENMASK(12, 1) #define RZG3S_SEL_PLL BIT(0) =20 +#define CPG_PLL1_SETTING_OFFSET(conf) FIELD_GET(GENMASK(11, 0), (conf)) #define CPG_PLL_STBY_OFFSET(conf) FIELD_GET(GENMASK(23, 12), (conf)) #define CPG_PLL_CLK1_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0x4) #define CPG_PLL_CLK2_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0x8) =20 -#define RZG3L_PLL_STBY_OFFSET(x) (GET_REG_SAMPLL_CLK1(x) - 0x4) +#define RZG3L_PLL_STBY_OFFSET(x) (CPG_PLL1_SETTING_OFFSET(x)) #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_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0xc) #define RZG3L_PLL_MON_RESETB BIT(0) #define RZG3L_PLL_MON_LOCK BIT(4) =20 @@ -75,8 +76,6 @@ #define CLK_MRST_R(reg) (0x180 + (reg)) =20 #define GET_REG_OFFSET(val) ((val >> 20) & 0xfff) -#define GET_REG_SAMPLL_CLK1(val) ((val >> 22) & 0xfff) -#define GET_REG_SAMPLL_SETTING(val) ((val) & 0xfff) =20 #define CPG_WEN_BIT BIT(16) =20 @@ -1147,14 +1146,14 @@ static unsigned long rzg3s_cpg_pll_clk_recalc_rate(= struct clk_hw *hw, u32 nir, nfr, mr, pr, val, setting; u64 rate; =20 - setting =3D GET_REG_SAMPLL_SETTING(pll_clk->conf); + setting =3D CPG_PLL1_SETTING_OFFSET(pll_clk->conf); if (setting) { val =3D readl(priv->base + setting); if (val & RZG3S_SEL_PLL) return pll_clk->default_rate; } =20 - val =3D readl(priv->base + GET_REG_SAMPLL_CLK1(pll_clk->conf)); + val =3D readl(priv->base + CPG_PLL_CLK1_OFFSET(pll_clk->conf)); =20 pr =3D 1 << FIELD_GET(RZG3S_DIV_P, val); /* Hardware interprets values higher than 8 as p =3D 16. */ diff --git a/drivers/clk/renesas/rzg2l-cpg.h b/drivers/clk/renesas/rzg2l-cp= g.h index 17ec6f285c21..bd6169f62538 100644 --- a/drivers/clk/renesas/rzg2l-cpg.h +++ b/drivers/clk/renesas/rzg2l-cpg.h @@ -59,6 +59,7 @@ #define CPG_CLKSTATUS_SELSDHI1_STS BIT(29) =20 #define CPG_SAM_PLL_CONF(stby) ((stby) << 12) +#define CPG_PLL_CONF(stby, setting) ((stby) << 12 | (setting)) =20 #define DDIV_PACK(offset, bitpos, size) \ (((offset) << 20) | ((bitpos) << 12) | ((size) << 8)) --=20 2.43.0 From nobody Sun Jun 14 02:38:03 2026 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 313723E022C for ; Mon, 4 May 2026 14:45:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777905931; cv=none; b=HNzgw4sd4Ma6qWouWhuwfPefYP110MULUsD734+cYUfST5cNpAXa04G5gHXFrHt385sZUXrQXiDNCJWoTnN+fPJoNTVHA4mLUmU4Rm6+srs7L7qP1U2B884scaMO0EwU6hGrcRfl41/6As5X8DvxDdzlvpXhpW0Abq9DIzDhAgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777905931; c=relaxed/simple; bh=DvSb/KRNVV3hvhkSLVMtHE11LLpVX9uZOzPUpgHDgA4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r+yZtcmtM4YYPNQ7UlWkf/ubf2Iim+Dnl8r4q6vvgitBjbG+O5t+i1fMJOqUvSB08NVZbUI4SZoG/xO/8KqD4e5As9KX/3bzBtT0xrz5oF33hm4giSbsbZAqo4fgcFL352EFR2ZP93VRH65FrTyCvguuw7WhVKnqGOaCvk1QrKM= 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=Ms8+S/N/; arc=none smtp.client-ip=209.85.221.47 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="Ms8+S/N/" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-44dd5cb0f81so635456f8f.0 for ; Mon, 04 May 2026 07:45:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777905928; x=1778510728; 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=XuEh6EHtxHCxSq+G/rcSFvtM5yky+sac6bh6RW7yjz0=; b=Ms8+S/N/V5tv6cxPhhjjrlBfkCdXMhGPlXZb8BG2oZfBePR/8jfjPUufhk7MBf9UJm IJLcVqDhPKcra+CeF1xKdybXxA2NOzoZhvdzgd4Jl9UrBorBErBIFcKfuO01TVt4omCE SNIyqy7twcHOoBPgBCCg4BS8xUpXbBgzsjsoC112Xzw9QyeHQiPPoGxCrDhbkXNLkCCt GshorA3FT5kY3R7LmrhT1wnzKxF/3yegfNGh8W0DWdSzsJkmvUEc/7NZntKUIheOPCu7 TrXWS4lOWxQO7QhCgKiTeQsY4jtpBDqtQV4GWR3x5P7px7c5bjZO968DHz6NjbnZjzwv b8qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777905928; x=1778510728; 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=XuEh6EHtxHCxSq+G/rcSFvtM5yky+sac6bh6RW7yjz0=; b=nt9B/a946oLy2afHnouI0bj1u4QOJnWA4yOx5ql3kc5/+ilGn4VTbBAXO+BENznEIj 9NCeZHg4Y3UTgP6LLB9zXvLljYBD4MrEspr8NhljgPqOVqkSZsKqBJaYy+nISYiryJy8 NbzXBNbhyngnC4i8kvY3CRuNqXQUgIw+ND3Mo2psm6HQYkk6K/g5cUpTUFHNa/+RAk4j TRWW/rlo7NwltaHO1LkNFHTLoLkO14HHUh5g6k1kP9c/ycnV2QDQ0Fle8ur4JMtORf64 BZhHtRFNmJON5Qwe2iaFIBreTtdM5xkOdq2uiFmUdf7UUCZnYvCTgfg4dHXow/ukTPvy uWcg== X-Forwarded-Encrypted: i=1; AFNElJ8bTYzX7gSFTIIFnAB5uG6b7pnpJUxdHY6xLDvSoD/merTqlkWT4p8QL+Xb7LFXnzoQ0a0yuvhEHLyYbaw=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6y9m8dVBk0OVsSHZuSdclS2ysQPVijXhTfWIs1Oq81EOtDZoi xiSKO66CsHA8aBJyZ5s29sYD/qJy6ijP2WIqqBfyGGZFZG0jIlunTEWe X-Gm-Gg: AeBDietNnNYYpn2SAou8gjKSLZZtmpFY30Vfb1Np6NPvXnt/txrmLt0iupgIw9YwwHu V6eqP6EnkTym3OMrIJuIpJ/Iz2vlP1xiVu83cUxXJVl4raaRY/H0Gy/fDTlAOldIL2iYDU0Pg5E n7USdCIgKnrMnVkz0ldI+BkmfRNeYN9fZbR1YuwSoL1+qBAs7w7ghYsF4l1PC+wsPGTogtap4vb GRBg1W7bs0H3Nkw2vQzdAA57pjKDU3ICofrCis4KE4JcML+v0hXHjOQq72SMYTLquUFQg9xr2VL kbDmHfYMB4eWPVUlFGQwSUqJJwiplPYK2q2fZQzu31f6QDSHWbDO7rSiEUJMrOIDveyd+SswP0T 6ajy3cE+sP+BKUQkqpkFADLbBR+QwvE9pmUGB81X+iZoO11RO0eWuUeTnYD8q7oH9VezdrjBLV6 VvrB4coMlCfHeMrh386nWmmu8ZYiPycNFY3aWFXCSdWHuYBjVGv6CjBA5TK3g= X-Received: by 2002:a5d:648d:0:b0:43f:e571:184d with SMTP id ffacd0b85a97d-44951508317mr19130124f8f.28.1777905928444; Mon, 04 May 2026 07:45:28 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:6444:b23f:58b2:338c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-44a981defa6sm24371239f8f.24.2026.05.04.07.45.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 07:45:28 -0700 (PDT) From: Biju X-Google-Original-From: Biju To: Geert Uytterhoeven , Michael Turquette , Stephen Boyd Cc: Biju Das , Brian Masney , linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Prabhakar Mahadev Lad , Biju Das Subject: [PATCH 3/3] clk: renesas: rzg2l: Rename RZG3L-prefixed PLL macros to CPG-prefixed ones Date: Mon, 4 May 2026 15:45:19 +0100 Message-ID: <20260504144523.153906-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260504144523.153906-1-biju.das.jz@bp.renesas.com> References: <20260504144523.153906-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 Rename RZG3L_PLL_STBY_OFFSET(), RZG3L_PLL_STBY_RESETB, RZG3L_PLL_STBY_RESETB_WEN, RZG3L_PLL_MON_OFFSET(), RZG3L_PLL_MON_RESETB, and RZG3L_PLL_MON_LOCK to their CPG_PLL_* equivalents to reflect that these macros are not RZG3L-specific and are shared across SoCs. Also fold CPG_PLL_MON_OFFSET() into rzg2l-cpg.c alongside the other CPG_PLL_*_OFFSET() helpers introduced in previous patches. No functional changes. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven --- drivers/clk/renesas/rzg2l-cpg.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cp= g.c index 7e5173a37f3a..498f2f1030cc 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -62,13 +62,12 @@ #define CPG_PLL_STBY_OFFSET(conf) FIELD_GET(GENMASK(23, 12), (conf)) #define CPG_PLL_CLK1_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0x4) #define CPG_PLL_CLK2_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0x8) +#define CPG_PLL_MON_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0xc) =20 -#define RZG3L_PLL_STBY_OFFSET(x) (CPG_PLL1_SETTING_OFFSET(x)) -#define RZG3L_PLL_STBY_RESETB BIT(0) -#define RZG3L_PLL_STBY_RESETB_WEN BIT(16) -#define RZG3L_PLL_MON_OFFSET(x) (CPG_PLL_STBY_OFFSET(x) + 0xc) -#define RZG3L_PLL_MON_RESETB BIT(0) -#define RZG3L_PLL_MON_LOCK BIT(4) +#define CPG_PLL_STBY_RESETB BIT(0) +#define CPG_PLL_STBY_RESETB_WEN BIT(16) +#define CPG_PLL_MON_RESETB BIT(0) +#define CPG_PLL_MON_LOCK BIT(4) =20 #define CLK_ON_R(reg) (reg) #define CLK_MON_R(reg) (0x180 + (reg)) @@ -1218,8 +1217,8 @@ 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; + u32 val =3D readl(priv->base + CPG_PLL_MON_OFFSET(pll_clk->conf)); + u32 mon_val =3D CPG_PLL_MON_RESETB | CPG_PLL_MON_LOCK; =20 /* Ensure both RESETB and LOCK bits are set */ return (mon_val =3D=3D (val & mon_val)); @@ -1229,17 +1228,17 @@ static int rzg3l_cpg_pll_clk_endisable(struct clk_h= w *hw, bool enable) { struct pll_clk *pll_clk =3D to_pll(hw); struct rzg2l_cpg_priv *priv =3D pll_clk->priv; - u32 mon_mask =3D RZG3L_PLL_MON_RESETB | RZG3L_PLL_MON_LOCK; - u32 val =3D RZG3L_PLL_STBY_RESETB_WEN; + u32 mon_mask =3D CPG_PLL_MON_RESETB | CPG_PLL_MON_LOCK; + u32 val =3D CPG_PLL_STBY_RESETB_WEN; u32 stby_offset, mon_offset; u32 mon_val =3D 0; int ret; =20 - stby_offset =3D RZG3L_PLL_STBY_OFFSET(pll_clk->conf); - mon_offset =3D RZG3L_PLL_MON_OFFSET(pll_clk->conf); + stby_offset =3D CPG_PLL_STBY_OFFSET(pll_clk->conf); + mon_offset =3D CPG_PLL_MON_OFFSET(pll_clk->conf); =20 if (enable) { - val |=3D RZG3L_PLL_STBY_RESETB; + val |=3D CPG_PLL_STBY_RESETB; mon_val =3D mon_mask; } =20 --=20 2.43.0