Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A24A2423A83 for ; Wed, 12 Aug 2026 10:47:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786531625; cv=none; b=qVvNwDCGGRIYeLrvvnCOUNm1q+YKsmUD8/z1HrA84NuFjowo0LseCRQxbtuPbKPMVJH70kQ/caNuj27viMOI109rAF53/VILVYghDs0kFxojTAYPDs52C6XO022TWGHaBGWiIfKNBTMqNNGeojWE9YMTK7R/Toxv7dSjpVUaNMY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786531625; c=relaxed/simple; bh=fu9p53cebUN0JjB4GfGk/LGtEAgRashqDjwW6n0Lyck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D4i2InPtcC/xBZa0pLmQNG2cw9WG4HzfCBlXcTmpdy6Ta1EgvNmmfVIu5a4FOV5mZIj/xaWbzgTNdhD+VQ/3iPO3X/nHudNNH5Lj0QU+QtfUrwMRFfMmY9i8Nweg9M+GUjuU9N7TyL1+SWWL/Pcc4L/UoQNuaVIS+Gs9TtB+ivI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=npJQ2yO3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="npJQ2yO3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 994211F00A3F; Wed, 12 Aug 2026 10:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786531624; bh=eSvqQCYSJU6D9aCZzo62Es8U+W5XkQx/aDb949igxNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=npJQ2yO3hCNK6sd1I5jTSOiv4qrIkRWFYZhMC0q5X7oJUuERCdd5u/+kg2e0VR1DC UnwVJCRdLDrIL6W32U4oRg7nMhyVp2Jq70z9CE5ozpD5nnXZgEV6IxUOj+NXeyye6p e53LBhVUDjMLRDHoeO/M9Z8wQinu+Shr4GGMKydhWTY15M14MblPNTugS4LkSbqxCI IjPE7tn/Nqwez0ed+1Z6Dck9XKOWgyW9pf31Icknf/fKLaKMImnq8YxBC1AgpILXe6 UwD3XJZFwSZIoApSt1AmdLE9H+uSUtbKcCdqU4y09HI+gPU8fFJ1NOTW3kIiMsMiw6 W1yQo9u1TJDlg== From: Sasha Levin To: stable@vger.kernel.org Cc: Biju Das , Geert Uytterhoeven , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.18.y 3/5] can: rcar_canfd: Use devm_clk_get_optional() for RAM clk Date: Wed, 12 Aug 2026 06:46:57 -0400 Message-ID: <20260812104700.1834989-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260812104700.1834989-1-sashal@kernel.org> References: <2026080503-lyricist-prowess-dca1@gregkh> <20260812104700.1834989-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Biju Das [ Upstream commit eda3d6c8d784835cec86f42b3f8118c9eb0cc58c ] Replace devm_clk_get_optional_enabled()->devm_clk_get_optional() as the RAM clk needs to be enabled in resume for proper operation in STR mode for RZ/G3E SoC. Signed-off-by: Biju Das Reviewed-by: Geert Uytterhoeven Link: https://patch.msgid.link/20251124102837.106973-4-biju.das.jz@bp.renesas.com Signed-off-by: Marc Kleine-Budde Stable-dep-of: bef9004c5b91 ("can: rcar_canfd: change the initializing flow for clocks and resets") Signed-off-by: Sasha Levin --- drivers/net/can/rcar/rcar_canfd.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index c6da880f8f89e..45df4929344e7 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -468,6 +468,7 @@ struct rcar_canfd_global { struct platform_device *pdev; /* Respective platform device */ struct clk *clkp; /* Peripheral clock */ struct clk *can_clk; /* fCAN clock */ + struct clk *clk_ram; /* Clock RAM */ unsigned long channels_mask; /* Enabled channels mask */ bool extclk; /* CANFD or Ext clock */ bool fdmode; /* CAN FD or Classical CAN only mode */ @@ -1985,7 +1986,6 @@ static int rcar_canfd_probe(struct platform_device *pdev) u32 rule_entry = 0; bool fdmode = true; /* CAN FD only mode - default */ char name[9] = "channelX"; - struct clk *clk_ram; int i; info = of_device_get_match_data(dev); @@ -2075,10 +2075,10 @@ static int rcar_canfd_probe(struct platform_device *pdev) gpriv->extclk = gpriv->info->external_clk; } - clk_ram = devm_clk_get_optional_enabled(dev, "ram_clk"); - if (IS_ERR(clk_ram)) - return dev_err_probe(dev, PTR_ERR(clk_ram), - "cannot get enabled ram clock\n"); + gpriv->clk_ram = devm_clk_get_optional(dev, "ram_clk"); + if (IS_ERR(gpriv->clk_ram)) + return dev_err_probe(dev, PTR_ERR(gpriv->clk_ram), + "cannot get ram clock\n"); addr = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(addr)) { @@ -2144,10 +2144,18 @@ static int rcar_canfd_probe(struct platform_device *pdev) goto fail_reset; } + /* Enable RAM clock */ + err = clk_prepare_enable(gpriv->clk_ram); + if (err) { + dev_err(dev, "failed to enable RAM clock: %pe\n", + ERR_PTR(err)); + goto fail_clk; + } + err = rcar_canfd_reset_controller(gpriv); if (err) { dev_err(dev, "reset controller failed: %pe\n", ERR_PTR(err)); - goto fail_clk; + goto fail_ram_clk; } /* Controller in Global reset & Channel reset mode */ @@ -2199,6 +2207,8 @@ static int rcar_canfd_probe(struct platform_device *pdev) rcar_canfd_channel_remove(gpriv, ch); fail_mode: rcar_canfd_disable_global_interrupts(gpriv); +fail_ram_clk: + clk_disable_unprepare(gpriv->clk_ram); fail_clk: clk_disable_unprepare(gpriv->clkp); fail_reset: @@ -2223,6 +2233,7 @@ static void rcar_canfd_remove(struct platform_device *pdev) /* Enter global sleep mode */ rcar_canfd_set_bit(gpriv->base, RCANFD_GCTR, RCANFD_GCTR_GSLPR); + clk_disable_unprepare(gpriv->clk_ram); clk_disable_unprepare(gpriv->clkp); reset_control_assert(gpriv->rstc2); reset_control_assert(gpriv->rstc1); -- 2.53.0