From patchwork Fri Feb 21 08:44:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13985018 X-Patchwork-Delegate: geert@linux-m68k.org Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [195.130.132.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 89BC3201005 for ; Fri, 21 Feb 2025 08:44:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.130.132.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740127500; cv=none; b=bTzSgZoRfrXK/GclIFt3zyuzenIpjeuA1yfB/un6zzbA5rw3SDmtNrtbjyKtEI1NNCTLMsuDNu18xxyNNKU3yh9nVAiHH6R8Mhk10EMe8q8OyommjNdoCHWoontt70bV3HHwV0YLR7sh9VY2lnEzrV6+7ZP0jGFKRXKRKDLdQjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740127500; c=relaxed/simple; bh=j/3PdtzWpWzBm2J9MQh8FH2EGJEGksBmZ1DN/D/ISNQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K8bVBxvz5X9KDsiLa5z4hsuJwWlPmmGjQBkq2Dw9h86ZqWnJ7mxmJbYkMR8q/zBvFRu4fOHJ079brmVyBMYOY4lV+kna/Mi447p+csOYc45U1wU9MSYJ8tn5ME0hO0buBTwNK38H2kX3OlXOj9l0EqNrVrGpyxXCwbEVECoXOfA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be; spf=none smtp.mailfrom=linux-m68k.org; arc=none smtp.client-ip=195.130.132.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux-m68k.org Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:ae9a:419e:d123:9695]) by baptiste.telenet-ops.be with cmsmtp id G8kp2E0070y8aK5018kp1P; Fri, 21 Feb 2025 09:44:50 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.97) (envelope-from ) id 1tlOe4-0000000BKsb-2yMc; Fri, 21 Feb 2025 09:44:49 +0100 Received: from geert by rox.of.borg with local (Exim 4.97) (envelope-from ) id 1tlOeP-0000000E5K1-0W1i; Fri, 21 Feb 2025 09:44:49 +0100 From: Geert Uytterhoeven To: Michael Turquette , Stephen Boyd , Wolfram Sang , Lad Prabhakar , Chris Brandt Cc: linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 1/3] clk: renesas: cpg-mssr: Remove obsolete nullify check Date: Fri, 21 Feb 2025 09:44:45 +0100 Message-ID: <59ef3eccde0b0b63626480f27e77d5c68948ca98.1740126560.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 All core clock nullify users and helpers were removed in commit b1dec4e78599a2ce ("clk: renesas: rcar-gen3: Disable R-Car H3 ES1.*"), but the CPG/MSSR driver still checks for nullified core clocks. Remove the obsolete check. Signed-off-by: Geert Uytterhoeven --- drivers/clk/renesas/renesas-cpg-mssr.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c index bf85501709f03b91..da021ee446ec8120 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c @@ -338,11 +338,6 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core, WARN_DEBUG(id >= priv->num_core_clks); WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT); - if (!core->name) { - /* Skip NULLified clock */ - return; - } - switch (core->type) { case CLK_TYPE_IN: clk = of_clk_get_by_name(priv->np, core->name); From patchwork Fri Feb 21 08:44:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13985015 X-Patchwork-Delegate: geert@linux-m68k.org Received: from albert.telenet-ops.be (albert.telenet-ops.be [195.130.137.90]) (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 A6D72201031 for ; Fri, 21 Feb 2025 08:44:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.130.137.90 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740127499; cv=none; b=Q1c6wHXiZt0ZEVf1SpXNscVqyNTiUzXq0ee05/dZS09/GyzAQtQ0Dg8/7ToTjll5+cugheez8k9jSN7TZAQJ69PmNaSNaf6BaTcI3LHJAsTqvDpkhC1wB+c4un1sJsNDgpKNAKpjeXG7g3URXhUnG8QuyZosj2mO3eFndiJ4XVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740127499; c=relaxed/simple; bh=6i83hX6VwKD3ElMxhPpSnKnbx/de5TK77AP6kfQbiqA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pmO81lKy0wuNhcI3Hfwort4sAN7p28DNn3HiawmvlEDCSnT1VLKCxA3we4XULZStI2Cbcb46XVdH2hJlAjbcnNFM3eNyC4JiWAJ4J/aDGvvm3hDuA5tGyNHh+HfRWIG3oyc+Ff2vEiGRilUfSRlSC8TgYhcTmlIGY68XvKGtMfk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be; spf=none smtp.mailfrom=linux-m68k.org; arc=none smtp.client-ip=195.130.137.90 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux-m68k.org Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:ae9a:419e:d123:9695]) by albert.telenet-ops.be with cmsmtp id G8kp2E0080y8aK5068kpU7; Fri, 21 Feb 2025 09:44:50 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.97) (envelope-from ) id 1tlOe4-0000000BKsd-33gP; Fri, 21 Feb 2025 09:44:49 +0100 Received: from geert by rox.of.borg with local (Exim 4.97) (envelope-from ) id 1tlOeP-0000000E5K4-0fTB; Fri, 21 Feb 2025 09:44:49 +0100 From: Geert Uytterhoeven To: Michael Turquette , Stephen Boyd , Wolfram Sang , Lad Prabhakar , Chris Brandt Cc: linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/3] clk: renesas: rzg2l: Remove unneeded nullify checks Date: Fri, 21 Feb 2025 09:44:46 +0100 Message-ID: <64702c33396dde2689b44d3e326aa1727ef1557a.1740126560.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 RZ/G2L family clock drivers never had a need to nullify clocks. Remove the unneeded checks. Signed-off-by: Geert Uytterhoeven --- drivers/clk/renesas/rzg2l-cpg.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/clk/renesas/rzg2l-cpg.c b/drivers/clk/renesas/rzg2l-cpg.c index a6b87cc66cbba485..b91dfbfb01e31cd8 100644 --- a/drivers/clk/renesas/rzg2l-cpg.c +++ b/drivers/clk/renesas/rzg2l-cpg.c @@ -1116,11 +1116,6 @@ rzg2l_cpg_register_core_clk(const struct cpg_core_clk *core, WARN_DEBUG(id >= priv->num_core_clks); WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT); - if (!core->name) { - /* Skip NULLified clock */ - return; - } - switch (core->type) { case CLK_TYPE_IN: clk = of_clk_get_by_name(priv->dev->of_node, core->name); @@ -1355,11 +1350,6 @@ rzg2l_cpg_register_mod_clk(const struct rzg2l_mod_clk *mod, WARN_DEBUG(mod->parent >= priv->num_core_clks + priv->num_mod_clks); WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT); - if (!mod->name) { - /* Skip NULLified clock */ - return; - } - parent = priv->clks[mod->parent]; if (IS_ERR(parent)) { clk = parent; From patchwork Fri Feb 21 08:44:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13985016 X-Patchwork-Delegate: geert@linux-m68k.org Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [195.130.132.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 89C1A20102A for ; Fri, 21 Feb 2025 08:44:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.130.132.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740127499; cv=none; b=pYLs1Y7ZbhCzOMbyE1l/V48LakOQI6vfVnf1amteTjC9tzhz3Tq+SiLA7ih9FUd0Brexk40PadHtdSPAevdGpIdbOwl8YBq8bZVYTQrf1nADdAtvzesNKWoEPMQ2H6QTn/7XYkttGfQyaNloOZ712XfRih2cNERrxCCKuZ+4/jI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740127499; c=relaxed/simple; bh=ErKt/IX3ty7Ak0Cdt/zKYdEi7M2ihahZ7kTQA445DEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vv0unjVlYHIsDe3NZm18G7cM1tjv7zoN1PZ+UnMBS1JPf5hTMzBcdKfYfoNHxwZjb5kLLmFXADsrndC1oQ11AE8HOpx5BwxxcJ3tyFrg/pVX6WLF1VSULIOpo88fjeAbCEdFJerS8cdhDfA7evmjffzI/Tx/09XOU7I76dfVcoM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be; spf=none smtp.mailfrom=linux-m68k.org; arc=none smtp.client-ip=195.130.132.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux-m68k.org Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:ae9a:419e:d123:9695]) by baptiste.telenet-ops.be with cmsmtp id G8kp2E0090y8aK5018kp1S; Fri, 21 Feb 2025 09:44:50 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.97) (envelope-from ) id 1tlOe4-0000000BKsg-38xd; Fri, 21 Feb 2025 09:44:49 +0100 Received: from geert by rox.of.borg with local (Exim 4.97) (envelope-from ) id 1tlOeP-0000000E5K9-0kmb; Fri, 21 Feb 2025 09:44:49 +0100 From: Geert Uytterhoeven To: Michael Turquette , Stephen Boyd , Wolfram Sang , Lad Prabhakar , Chris Brandt Cc: linux-renesas-soc@vger.kernel.org, linux-clk@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 3/3] clk: renesas: r7s9210: Distinguish clocks by clock type Date: Fri, 21 Feb 2025 09:44:47 +0100 Message-ID: <7e61ea78e9919148e73867088ccbc3509364952e.1740126560.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When registering a clock, its type should be devised from the clock's type member, not from its id member. Merge the two checks for the main clock, to improve readability. Signed-off-by: Geert Uytterhoeven --- drivers/clk/renesas/r7s9210-cpg-mssr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/clk/renesas/r7s9210-cpg-mssr.c b/drivers/clk/renesas/r7s9210-cpg-mssr.c index a85227c248f31cb2..e1812867a6da4ea9 100644 --- a/drivers/clk/renesas/r7s9210-cpg-mssr.c +++ b/drivers/clk/renesas/r7s9210-cpg-mssr.c @@ -170,11 +170,12 @@ static struct clk * __init rza2_cpg_clk_register(struct device *dev, if (IS_ERR(parent)) return ERR_CAST(parent); - switch (core->id) { - case CLK_MAIN: + switch (core->type) { + case CLK_TYPE_RZA_MAIN: + r7s9210_update_clk_table(parent, base); break; - case CLK_PLL: + case CLK_TYPE_RZA_PLL: if (cpg_mode) mult = 44; /* Divider 1 is 1/2 */ else @@ -185,9 +186,6 @@ static struct clk * __init rza2_cpg_clk_register(struct device *dev, return ERR_PTR(-EINVAL); } - if (core->id == CLK_MAIN) - r7s9210_update_clk_table(parent, base); - return clk_register_fixed_factor(NULL, core->name, __clk_get_name(parent), 0, mult, div); }