From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 06D2A344DAE for ; Tue, 9 Jun 2026 01:32:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780968729; cv=none; b=PiXJcZEufl+ZjeXtruLpEBMjfIHm1Y4aMU3FjRXFDGv6Qk+TFQjjMt4dx9ejxfk+mSs2nlOeNfeqexEzr6wLmDCxlsAHmxrWo0S6DqvMu8iP5m1nIPG+09kGZ7CTNunzy4aDSc4RjL9bWC5wKV/DiFRFCleBw+bhbu//ZHhtk24= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780968729; c=relaxed/simple; bh=/wFz177WD3SJ6TlQiCBL0Au+rgkwIfaDTqf/SlngIsM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fv2J8IUAMWEvUWhDSTQIQt1mfd+6vsRK2O3+0AdZylrOIy+fVXLYbm5JsUk1k/7T4Mxey858tvt651gUPLT74FJY5wk+zkJonBgbTX+EHDAObZjqKAaBI4xxTUn4PjWTo33Kq7zLMae61ndCq/xG+Lrtan82x6IcePnYPGD4Ap0= 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=pTDcMZ6G; arc=none smtp.client-ip=209.85.214.172 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="pTDcMZ6G" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2c0aa420401so38202445ad.3 for ; Mon, 08 Jun 2026 18:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780968724; x=1781573524; 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=m8p33kKo2+s8dyswBbfJmCPtBlgGA9fVQCE0brP+A/g=; b=pTDcMZ6GHW8NgPLm7Fxx0cHPQd+bn3piHYZd2swh3QhFuFa1Q7O3ky6CPVcgPhU/H+ Z7kdwGrSeP9cWOrrDdRScfKG8Z+i1ZocLFDzUqKxGbZimkwlaWwDqRVykP12meDCay7Y UPIyn/+YkMttxinMThsdOi5T38QGSAyF4gUvil8Vm3Wt0XbAvoStdLOFApWD+iRvEdbX lYHOn9/FqpciWL4BTWH+hhGVxSu6qfdQ++HuYEV+MvU1UMOzO4xHDtljZxOaDY0Q7raU qyeURMG4mUGfwxID7CVOz9FnLiuumgqrqZwIIVObgdYXBb16kcK2G9IohgoALgmz3Xpp ICKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780968724; x=1781573524; 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=m8p33kKo2+s8dyswBbfJmCPtBlgGA9fVQCE0brP+A/g=; b=k3hA36bT/sIFnu2D7x3AgiVLAOy6euTFRTsr5ORaEMoyY5Y0eEDwh9CyhauI0IbH3s dwKb+GSPpW5ltEO6Z8K57O9DGInuxhtQokPkRGV0NHTDDyddWgSBOjL1gMOOHbNyMU3y Px1CGUA/ktBRp5ISigigL50B+tJErhPbD0CQ+SmfWIPaiRzz6RRYdh6Zr7uTR1S8cWP5 kL9A9UsPWZZT46DtJeYKP6bg/f2leKZh9SkYhlaGup6Z0NewglSOC5i16SdEWV1jbJuG 9t8mIzgf8UGdmG5Rwk0XPSTd4zmp/yWvn11n6e+4fRepP19EeDT9+0HBbQ+Xe1E13X7+ zyAQ== X-Forwarded-Encrypted: i=1; AFNElJ8A00yEJXOdCEEJwXUVO5IZ6157FpEI+ePm9HWWOaqwxqFc5o2CWxeI52BEI6LqSfa8nHqzwc4KCcIlN38=@vger.kernel.org X-Gm-Message-State: AOJu0Yy04ovGBVu/E23qPR0ic9tdl8HhF3+lcf+e5Sw2wOvxku3aVFez rp02XGoI13QIJgiY1mVRLplrw97dH0W590wTEnf42Y2/ilgWubHlnm37 X-Gm-Gg: Acq92OHq//UYuIEFcXZSCW28ixokPNfbWRTjkYyWU37BKjyxMHyzUawhu5u+NkxRgBc +c+aoBUxlxXvhDGIVFn26RN0gB/ccp9Qr3DFnffzMnH3h7PgpwZ9HMCHC0gsHtjPf6X0mw4hVMV lsNIf+dbG9OLo8u1gINRm+qq0it0iD8NurGZ64PLjSylqW1XOeO05SP4tVxFgQh9/0VRlIPZFqu oDed/bu0ouY+ZxTkJ/CdmaxoowYJ9e4oEPnSz/bvwV/8SlG/wvbzybcwmQokAX+r28iX+lSJhRx LsPpXPRXsQis9P09iapivpdYJ/0pVr71mYJE557znRs9ipsFLoEjeQD5B7KkUJPdxhkJni6ZFKN Xt6Np8k2kRLxlrXqHZcbsL3IucgJau2ANwPFmDygGJohZHE/uxoQBCh1Ma2lrCEcQcvdEEmusIE 7c46ENyopvQ2k4TFFMR4bANU638fkj9CVgdd5uyZDkuU9pMkD1/na+/AZSK4UjBG2fe9tw X-Received: by 2002:a17:903:2a87:b0:2bf:13b0:f8ed with SMTP id d9443c01a7336-2c1e7b2ce09mr252583915ad.3.1780968724400; Mon, 08 Jun 2026 18:32:04 -0700 (PDT) Received: from phuc-desktop.. ([183.91.15.56]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2c16609e627sm198765335ad.52.2026.06.08.18.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2026 18:32:04 -0700 (PDT) From: phucduc.bui@gmail.com To: Kuninori Morimoto , Mark Brown , Geert Uytterhoeven Cc: Liam Girdwood , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Magnus Damm , Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, bui duc phuc Subject: [PATCH v5 08/11] ASoC: renesas: fsi: refactor clock initialization Date: Tue, 9 Jun 2026 08:31:04 +0700 Message-ID: <20260609013107.5995-9-phucduc.bui@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260609013107.5995-1-phucduc.bui@gmail.com> References: <20260609013107.5995-1-phucduc.bui@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: bui duc phuc Move fsi_clk_init() from set_fmt() to the probe path. This ensures that clock resources are acquired only once during device initialization, instead of being looked up repeatedly whenever set_fmt() is called. Together with the previous conversion to devm_clk_get_optional(), the driver can now probe successfully even when optional clocks are absent. The set_rate() callbacks continue to validate that all required clocks are available before applying hardware-specific configuration. Suggested-by: Kuninori Morimoto Signed-off-by: bui duc phuc --- Changes in v5: - Reorder the patches - update the error handling path to ensure proper cleanup by Sashiko Changes in v4: - Handle the return value of fsi_clk_init() to properly support deferred probe, as suggested by Mark. sound/soc/renesas/fsi.c | 63 +++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/sound/soc/renesas/fsi.c b/sound/soc/renesas/fsi.c index e29be2bcf952..13988c7dc926 100644 --- a/sound/soc/renesas/fsi.c +++ b/sound/soc/renesas/fsi.c @@ -862,6 +862,11 @@ static int fsi_clk_set_rate_external(struct device *dev, int ackmd, bpfmd; int ret = 0; + if (!xck || !ick) { + dev_err(dev, "xck clock or ick clock is missing\n"); + return -EINVAL; + } + /* check clock rate */ xrate = clk_get_rate(xck); if (xrate % rate) { @@ -898,6 +903,11 @@ static int fsi_clk_set_rate_cpg(struct device *dev, int ackmd, bpfmd; int ret = -EINVAL; + if (!ick || !div) { + dev_err(dev, "ick clock or div clock is missing\n"); + return -EINVAL; + } + if (!(12288000 % rate)) target = 12288000; if (!(11289600 % rate)) @@ -970,35 +980,35 @@ static int fsi_clk_set_rate_cpg(struct device *dev, return ret; } -static int fsi_clk_init(struct device *dev, - struct fsi_priv *fsi, - int xck, - int ick, - int div, - int (*set_rate)(struct device *dev, - struct fsi_priv *fsi)) +static int fsi_clk_init(struct device *dev, struct fsi_priv *fsi) { struct fsi_clk *clock = &fsi->clock; int is_porta = fsi_is_port_a(fsi); + int xck, ick, div; + + if (fsi->clk_cpg) { + xck = 0; ick = 1; div = 1; + clock->set_rate = fsi_clk_set_rate_cpg; + } else { + xck = 1; ick = 1; div = 0; + clock->set_rate = fsi_clk_set_rate_external; + } clock->xck = NULL; clock->ick = NULL; clock->div = NULL; clock->rate = 0; clock->count = 0; - clock->set_rate = set_rate; clock->own = devm_clk_get(dev, NULL); if (IS_ERR(clock->own)) - return -EINVAL; + return dev_err_probe(dev, PTR_ERR(clock->own), "Can't get fck clock\n"); /* external clock */ if (xck) { clock->xck = devm_clk_get_optional(dev, is_porta ? "xcka" : "xckb"); - if (IS_ERR(clock->xck)) { - dev_err(dev, "can't get xck clock\n"); - return -EINVAL; - } + if (IS_ERR(clock->xck)) + return dev_err_probe(dev, PTR_ERR(clock->xck), "Can't get xck clock\n"); if (clock->xck == clock->own) { dev_err(dev, "cpu doesn't support xck clock\n"); return -EINVAL; @@ -1008,10 +1018,8 @@ static int fsi_clk_init(struct device *dev, /* FSIACLK/FSIBCLK */ if (ick) { clock->ick = devm_clk_get_optional(dev, is_porta ? "icka" : "ickb"); - if (IS_ERR(clock->ick)) { - dev_err(dev, "can't get ick clock\n"); - return -EINVAL; - } + if (IS_ERR(clock->ick)) + return dev_err_probe(dev, PTR_ERR(clock->ick), "Can't get ick clock\n"); if (clock->ick == clock->own) { dev_err(dev, "cpu doesn't support ick clock\n"); return -EINVAL; @@ -1021,10 +1029,8 @@ static int fsi_clk_init(struct device *dev, /* FSI-DIV */ if (div) { clock->div = devm_clk_get_optional(dev, is_porta ? "diva" : "divb"); - if (IS_ERR(clock->div)) { - dev_err(dev, "can't get div clock\n"); - return -EINVAL; - } + if (IS_ERR(clock->div)) + return dev_err_probe(dev, PTR_ERR(clock->div), "Can't get div clock\n"); if (clock->div == clock->own) { dev_err(dev, "cpu doesn't support div clock\n"); return -EINVAL; @@ -1672,15 +1678,6 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; } - if (fsi_is_clk_master(fsi)) { - if (fsi->clk_cpg) - fsi_clk_init(dai->dev, fsi, 0, 1, 1, - fsi_clk_set_rate_cpg); - else - fsi_clk_init(dai->dev, fsi, 1, 1, 0, - fsi_clk_set_rate_external); - } - /* set format */ if (fsi_is_spdif(fsi)) ret = fsi_set_fmt_spdif(fsi); @@ -1983,6 +1980,9 @@ static int fsi_probe(struct platform_device *pdev) dev_err(&pdev->dev, "FSIA stream probe failed\n"); return ret; } + ret = fsi_clk_init(&pdev->dev, fsi); + if (ret) + goto exit_fsia; /* FSI B setting */ fsi = &master->fsib; @@ -1996,6 +1996,9 @@ static int fsi_probe(struct platform_device *pdev) dev_err(&pdev->dev, "FSIB stream probe failed\n"); goto exit_fsia; } + ret = fsi_clk_init(&pdev->dev, fsi); + if (ret) + goto exit_fsib; pm_runtime_enable(&pdev->dev); dev_set_drvdata(&pdev->dev, master); -- 2.43.0