clk: st: clkgen-pll: embed soc clock outputs within compatible data

In order to avoid relying on the old style description via the DT
clock-output-names, add compatible data describing the flexgen
outputs clocks for all STiH407/STiH410 and STiH418 SOCs.

In order to ease transition between the two methods, this commit
introduce the new compatible without removing the old method.
Once DTs will be fixed, the method relying on DT clock-output-names
will be removed from this driver as well as old compatibles.

Signed-off-by: Alain Volmat <avolmat@me.com>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
Link: https://lore.kernel.org/r/20210331201632.24530-5-avolmat@me.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/st/clkgen-pll.c b/drivers/clk/st/clkgen-pll.c
index f6c56ca90c7d42ecbe266b7a5805086155c1e4aa..b36e4d8036364a126fea3afdd8b936fb93de27f2 100644 (file)
--- a/drivers/clk/st/clkgen-pll.c
+++ b/drivers/clk/st/clkgen-pll.c
@@ -57,6 +57,17 @@ struct clkgen_pll_data {
        const struct clk_ops *ops;
 };
 
+struct clkgen_clk_out {
+       const char *name;
+       unsigned long flags;
+};
+
+struct clkgen_pll_data_clks {
+       struct clkgen_pll_data *data;
+       const struct clkgen_clk_out *outputs;
+};
+
+
 static const struct clk_ops stm_pll3200c32_ops;
 static const struct clk_ops stm_pll3200c32_a9_ops;
 static const struct clk_ops stm_pll4600c28_ops;
@@ -74,6 +85,28 @@ static const struct clkgen_pll_data st_pll3200c32_cx_0 = {
        .ops            = &stm_pll3200c32_ops,
 };
 
+static const struct clkgen_pll_data_clks st_pll3200c32_cx_0_legacy_data = {
+       .data   = (struct clkgen_pll_data *)&st_pll3200c32_cx_0,
+};
+
+static const struct clkgen_clk_out st_pll3200c32_ax_0_clks[] = {
+       { .name = "clk-s-a0-pll-odf-0", },
+};
+
+static const struct clkgen_pll_data_clks st_pll3200c32_a0_data = {
+       .data           = (struct clkgen_pll_data *)&st_pll3200c32_cx_0,
+       .outputs        = st_pll3200c32_ax_0_clks,
+};
+
+static const struct clkgen_clk_out st_pll3200c32_cx_0_clks[] = {
+       { .name = "clk-s-c0-pll0-odf-0", },
+};
+
+static const struct clkgen_pll_data_clks st_pll3200c32_c0_data = {
+       .data           = (struct clkgen_pll_data *)&st_pll3200c32_cx_0,
+       .outputs        = st_pll3200c32_cx_0_clks,
+};
+
 static const struct clkgen_pll_data st_pll3200c32_cx_1 = {
        /* 407 C0 PLL1 */
        .pdn_status     = CLKGEN_FIELD(0x2c8,   0x1,                    8),
@@ -87,6 +120,19 @@ static const struct clkgen_pll_data st_pll3200c32_cx_1 = {
        .ops            = &stm_pll3200c32_ops,
 };
 
+static const struct clkgen_pll_data_clks st_pll3200c32_cx_1_legacy_data = {
+       .data   = (struct clkgen_pll_data *)&st_pll3200c32_cx_1,
+};
+
+static const struct clkgen_clk_out st_pll3200c32_cx_1_clks[] = {
+       { .name = "clk-s-c0-pll1-odf-0", },
+};
+
+static const struct clkgen_pll_data_clks st_pll3200c32_c1_data = {
+       .data           = (struct clkgen_pll_data *)&st_pll3200c32_cx_1,
+       .outputs        = st_pll3200c32_cx_1_clks,
+};
+
 static const struct clkgen_pll_data st_pll3200c32_407_a9 = {
        /* 407 A9 */
        .pdn_status     = CLKGEN_FIELD(0x1a8,   0x1,                    0),
@@ -104,6 +150,15 @@ static const struct clkgen_pll_data st_pll3200c32_407_a9 = {
        .ops            = &stm_pll3200c32_a9_ops,
 };
 
+static const struct clkgen_clk_out st_pll3200c32_407_a9_clks[] = {
+       { .name = "clockgen-a9-pll-odf", },
+};
+
+static const struct clkgen_pll_data_clks st_pll3200c32_407_a9_data = {
+       .data           = (struct clkgen_pll_data *)&st_pll3200c32_407_a9,
+       .outputs        = st_pll3200c32_407_a9_clks,
+};
+
 static struct clkgen_pll_data st_pll4600c28_418_a9 = {
        /* 418 A9 */
        .pdn_status     = CLKGEN_FIELD(0x1a8,   0x1,                    0),
@@ -120,6 +175,15 @@ static struct clkgen_pll_data st_pll4600c28_418_a9 = {
        .ops            = &stm_pll4600c28_ops,
 };
 
+static const struct clkgen_clk_out st_pll4600c28_418_a9_clks[] = {
+       { .name = "clockgen-a9-pll-odf", },
+};
+
+static const struct clkgen_pll_data_clks st_pll4600c28_418_a9_data = {
+       .data           = (struct clkgen_pll_data *)&st_pll4600c28_418_a9,
+       .outputs        = st_pll4600c28_418_a9_clks,
+};
+
 /**
  * DOC: Clock Generated by PLL, rate set and enabled by bootloader
  *
@@ -684,7 +748,7 @@ static struct clk * __init clkgen_odf_register(const char *parent_name,
 
 
 static void __init clkgen_c32_pll_setup(struct device_node *np,
-               struct clkgen_pll_data *data)
+               struct clkgen_pll_data_clks *datac)
 {
        struct clk *clk;
        const char *parent_name, *pll_name;
@@ -704,14 +768,14 @@ static void __init clkgen_c32_pll_setup(struct device_node *np,
 
        of_clk_detect_critical(np, 0, &pll_flags);
 
-       clk = clkgen_pll_register(parent_name, data, pll_base, pll_flags,
-                                 np->name, data->lock);
+       clk = clkgen_pll_register(parent_name, datac->data, pll_base, pll_flags,
+                                 np->name, datac->data->lock);
        if (IS_ERR(clk))
                return;
 
        pll_name = __clk_get_name(clk);
 
-       num_odfs = data->num_odfs;
+       num_odfs = datac->data->num_odfs;
 
        clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL);
        if (!clk_data)
@@ -729,14 +793,21 @@ static void __init clkgen_c32_pll_setup(struct device_node *np,
                const char *clk_name;
                unsigned long odf_flags = 0;
 
-               if (of_property_read_string_index(np, "clock-output-names",
-                                                 odf, &clk_name))
-                       return;
+               if (datac->outputs) {
+                       clk_name = datac->outputs[odf].name;
+                       odf_flags = datac->outputs[odf].flags;
+               } else {
+                       if (of_property_read_string_index(np,
+                                                         "clock-output-names",
+                                                         odf, &clk_name))
+                               return;
 
-               of_clk_detect_critical(np, odf, &odf_flags);
+                       of_clk_detect_critical(np, odf, &odf_flags);
+               }
 
-               clk = clkgen_odf_register(pll_name, pll_base, data, odf_flags,
-                               odf, &clkgena_c32_odf_lock, clk_name);
+               clk = clkgen_odf_register(pll_name, pll_base, datac->data,
+                               odf_flags, odf, &clkgena_c32_odf_lock,
+                               clk_name);
                if (IS_ERR(clk))
                        goto err;
 
@@ -754,27 +825,48 @@ err:
 static void __init clkgen_c32_pll0_setup(struct device_node *np)
 {
        clkgen_c32_pll_setup(np,
-                       (struct clkgen_pll_data *) &st_pll3200c32_cx_0);
+               (struct clkgen_pll_data_clks *) &st_pll3200c32_cx_0_legacy_data);
 }
 CLK_OF_DECLARE(c32_pll0, "st,clkgen-pll0", clkgen_c32_pll0_setup);
 
+static void __init clkgen_c32_pll0_a0_setup(struct device_node *np)
+{
+       clkgen_c32_pll_setup(np,
+               (struct clkgen_pll_data_clks *) &st_pll3200c32_a0_data);
+}
+CLK_OF_DECLARE(c32_pll0_a0, "st,clkgen-pll0-a0", clkgen_c32_pll0_a0_setup);
+
+static void __init clkgen_c32_pll0_c0_setup(struct device_node *np)
+{
+       clkgen_c32_pll_setup(np,
+               (struct clkgen_pll_data_clks *) &st_pll3200c32_c0_data);
+}
+CLK_OF_DECLARE(c32_pll0_c0, "st,clkgen-pll0-c0", clkgen_c32_pll0_c0_setup);
+
 static void __init clkgen_c32_pll1_setup(struct device_node *np)
 {
        clkgen_c32_pll_setup(np,
-                       (struct clkgen_pll_data *) &st_pll3200c32_cx_1);
+               (struct clkgen_pll_data_clks *) &st_pll3200c32_cx_1_legacy_data);
 }
 CLK_OF_DECLARE(c32_pll1, "st,clkgen-pll1", clkgen_c32_pll1_setup);
 
+static void __init clkgen_c32_pll1_c0_setup(struct device_node *np)
+{
+       clkgen_c32_pll_setup(np,
+               (struct clkgen_pll_data_clks *) &st_pll3200c32_c1_data);
+}
+CLK_OF_DECLARE(c32_pll1_c0, "st,clkgen-pll1-c0", clkgen_c32_pll1_c0_setup);
+
 static void __init clkgen_c32_plla9_setup(struct device_node *np)
 {
        clkgen_c32_pll_setup(np,
-                       (struct clkgen_pll_data *) &st_pll3200c32_407_a9);
+               (struct clkgen_pll_data_clks *) &st_pll3200c32_407_a9_data);
 }
 CLK_OF_DECLARE(c32_plla9, "st,stih407-clkgen-plla9", clkgen_c32_plla9_setup);
 
 static void __init clkgen_c28_plla9_setup(struct device_node *np)
 {
        clkgen_c32_pll_setup(np,
-                       (struct clkgen_pll_data *) &st_pll4600c28_418_a9);
+               (struct clkgen_pll_data_clks *) &st_pll4600c28_418_a9_data);
 }
 CLK_OF_DECLARE(c28_plla9, "st,stih418-clkgen-plla9", clkgen_c28_plla9_setup);