ASoC: renesas: fsi: refactor clock initialization

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.

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Suggested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Link: https://patch.msgid.link/20260609113836.45079-9-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/renesas/fsi.c b/sound/soc/renesas/fsi.c
index e29be2bcf952c0faa005113832cfb32df5aba12f..43bc77ebcca39df595498ad5d488eaaa64c67d00 100644 (file)
--- 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);
@@ -1978,6 +1975,11 @@ static int fsi_probe(struct platform_device *pdev)
        fsi->master     = master;
        fsi_port_info_init(fsi, &info.port_a);
        fsi_handler_init(fsi, &info.port_a);
+       ret = fsi_clk_init(&pdev->dev, fsi);
+       if (ret) {
+               dev_err(&pdev->dev, "FSIA clk init failed\n");
+               return ret;
+       }
        ret = fsi_stream_probe(fsi, &pdev->dev);
        if (ret < 0) {
                dev_err(&pdev->dev, "FSIA stream probe failed\n");
@@ -1991,6 +1993,11 @@ static int fsi_probe(struct platform_device *pdev)
        fsi->master     = master;
        fsi_port_info_init(fsi, &info.port_b);
        fsi_handler_init(fsi, &info.port_b);
+       ret = fsi_clk_init(&pdev->dev, fsi);
+       if (ret) {
+               dev_err(&pdev->dev, "FSIB clk init failed\n");
+               goto exit_fsia;
+       }
        ret = fsi_stream_probe(fsi, &pdev->dev);
        if (ret < 0) {
                dev_err(&pdev->dev, "FSIB stream probe failed\n");