clk: keystone: sci-clk: Adding support for non contiguous clocks

Most of clocks and their parents are defined in contiguous range,
But in few cases, there is gap in clock numbers[0].
Driver assumes clocks to be in contiguous range, and add their clock
ids incrementally.

New firmware started returning error while calling get_freq and is_on
API for non-available clock ids.

In this fix, driver checks and adds only valid clock ids.

[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j7200/clocks.html
Section Clocks for NAVSS0_CPTS_0 Device, clock id 12-15 not present.

Fixes: 3c13933c6033 ("clk: keystone: sci-clk: add support for dynamically probing clocks")
Signed-off-by: Udit Kumar <u-kumar1@ti.com>
Link: https://lore.kernel.org/r/20240213082640.457316-1-u-kumar1@ti.com
Reviewed-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/keystone/sci-clk.c b/drivers/clk/keystone/sci-clk.c
index 35fe197dd303c6830f5639fdcccdbf131493480a..eb2ef44869b235cc7d33076ad8d58927ae049874 100644 (file)
--- a/drivers/clk/keystone/sci-clk.c
+++ b/drivers/clk/keystone/sci-clk.c
@@ -516,6 +516,7 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider)
        struct sci_clk *sci_clk, *prev;
        int num_clks = 0;
        int num_parents;
+       bool state;
        int clk_id;
        const char * const clk_names[] = {
                "clocks", "assigned-clocks", "assigned-clock-parents", NULL
@@ -586,6 +587,15 @@ static int ti_sci_scan_clocks_from_dt(struct sci_clk_provider *provider)
                                clk_id = args.args[1] + 1;
 
                                while (num_parents--) {
+                                       /* Check if this clock id is valid */
+                                       ret = provider->ops->is_auto(provider->sci,
+                                               sci_clk->dev_id, clk_id, &state);
+
+                                       if (ret) {
+                                               clk_id++;
+                                               continue;
+                                       }
+
                                        sci_clk = devm_kzalloc(dev,
                                                               sizeof(*sci_clk),
                                                               GFP_KERNEL);