clk: fixed-factor: add fwname-based constructor functions

Add four functions to register clk_hw based on the fw_name field in
clk_parent_data, ie the value in the DT property `clock-names`.

There are variants for devm or not and passing an accuracy or not
passing one:

 - clk_hw_register_fixed_factor_fwname
 - clk_hw_register_fixed_factor_with_accuracy_fwname
 - devm_clk_hw_register_fixed_factor_fwname
 - devm_clk_hw_register_fixed_factor_with_accuracy_fwname

The `struct clk_parent_data` init is extracted from
__clk_hw_register_fixed_factor to each calling function. It is required
to allow each function to pass whatever field they want, not only index.

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Link: https://lore.kernel.org/r/20240221-mbly-clk-v7-2-31d4ce3630c3@bootlin.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c
index bc2644a9bd7d090d7e42ae9e972218b997821841..fe0500a1af3ea807839b444ecc59b8a6d324309d 100644 (file)
--- a/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@ -91,13 +91,12 @@ static void devm_clk_hw_register_fixed_factor_release(struct device *dev, void *
 static struct clk_hw *
 __clk_hw_register_fixed_factor(struct device *dev, struct device_node *np,
                const char *name, const char *parent_name,
-               const struct clk_hw *parent_hw, int index,
+               const struct clk_hw *parent_hw, const struct clk_parent_data *pdata,
                unsigned long flags, unsigned int mult, unsigned int div,
                unsigned long acc, unsigned int fixflags, bool devm)
 {
        struct clk_fixed_factor *fix;
        struct clk_init_data init = { };
-       struct clk_parent_data pdata = { .index = index };
        struct clk_hw *hw;
        int ret;
 
@@ -128,7 +127,7 @@ __clk_hw_register_fixed_factor(struct device *dev, struct device_node *np,
        else if (parent_hw)
                init.parent_hws = &parent_hw;
        else
-               init.parent_data = &pdata;
+               init.parent_data = pdata;
        init.num_parents = 1;
 
        hw = &fix->hw;
@@ -165,7 +164,9 @@ struct clk_hw *devm_clk_hw_register_fixed_factor_index(struct device *dev,
                const char *name, unsigned int index, unsigned long flags,
                unsigned int mult, unsigned int div)
 {
-       return __clk_hw_register_fixed_factor(dev, NULL, name, NULL, NULL, index,
+       const struct clk_parent_data pdata = { .index = index };
+
+       return __clk_hw_register_fixed_factor(dev, NULL, name, NULL, NULL, &pdata,
                                              flags, mult, div, 0, 0, true);
 }
 EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor_index);
@@ -187,8 +188,10 @@ struct clk_hw *devm_clk_hw_register_fixed_factor_parent_hw(struct device *dev,
                const char *name, const struct clk_hw *parent_hw,
                unsigned long flags, unsigned int mult, unsigned int div)
 {
+       const struct clk_parent_data pdata = { .index = -1 };
+
        return __clk_hw_register_fixed_factor(dev, NULL, name, NULL, parent_hw,
-                                             -1, flags, mult, div, 0, 0, true);
+                                             &pdata, flags, mult, div, 0, 0, true);
 }
 EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor_parent_hw);
 
@@ -196,9 +199,10 @@ struct clk_hw *clk_hw_register_fixed_factor_parent_hw(struct device *dev,
                const char *name, const struct clk_hw *parent_hw,
                unsigned long flags, unsigned int mult, unsigned int div)
 {
-       return __clk_hw_register_fixed_factor(dev, NULL, name, NULL,
-                                             parent_hw, -1, flags, mult, div,
-                                             0, 0, false);
+       const struct clk_parent_data pdata = { .index = -1 };
+
+       return __clk_hw_register_fixed_factor(dev, NULL, name, NULL, parent_hw,
+                                             &pdata, flags, mult, div, 0, 0, false);
 }
 EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor_parent_hw);
 
@@ -206,11 +210,37 @@ struct clk_hw *clk_hw_register_fixed_factor(struct device *dev,
                const char *name, const char *parent_name, unsigned long flags,
                unsigned int mult, unsigned int div)
 {
-       return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, NULL, -1,
-                                             flags, mult, div, 0, 0, false);
+       const struct clk_parent_data pdata = { .index = -1 };
+
+       return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, NULL,
+                                             &pdata, flags, mult, div, 0, 0, false);
 }
 EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor);
 
+struct clk_hw *clk_hw_register_fixed_factor_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div)
+{
+       const struct clk_parent_data pdata = { .index = -1, .fw_name = fw_name };
+
+       return __clk_hw_register_fixed_factor(dev, np, name, NULL, NULL,
+                       &pdata, flags, mult, div, 0, 0, false);
+}
+EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor_fwname);
+
+struct clk_hw *clk_hw_register_fixed_factor_with_accuracy_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div,
+               unsigned long acc)
+{
+       const struct clk_parent_data pdata = { .index = -1, .fw_name = fw_name };
+
+       return __clk_hw_register_fixed_factor(dev, np, name, NULL, NULL,
+                       &pdata, flags, mult, div, acc,
+                       CLK_FIXED_FACTOR_FIXED_ACCURACY, false);
+}
+EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor_with_accuracy_fwname);
+
 struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
                const char *parent_name, unsigned long flags,
                unsigned int mult, unsigned int div)
@@ -253,16 +283,43 @@ struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev,
                const char *name, const char *parent_name, unsigned long flags,
                unsigned int mult, unsigned int div)
 {
-       return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, NULL, -1,
-                       flags, mult, div, 0, 0, true);
+       const struct clk_parent_data pdata = { .index = -1 };
+
+       return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, NULL,
+                       &pdata, flags, mult, div, 0, 0, true);
 }
 EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor);
 
+struct clk_hw *devm_clk_hw_register_fixed_factor_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div)
+{
+       const struct clk_parent_data pdata = { .index = -1, .fw_name = fw_name };
+
+       return __clk_hw_register_fixed_factor(dev, np, name, NULL, NULL,
+                       &pdata, flags, mult, div, 0, 0, true);
+}
+EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor_fwname);
+
+struct clk_hw *devm_clk_hw_register_fixed_factor_with_accuracy_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div,
+               unsigned long acc)
+{
+       const struct clk_parent_data pdata = { .index = -1, .fw_name = fw_name };
+
+       return __clk_hw_register_fixed_factor(dev, np, name, NULL, NULL,
+                       &pdata, flags, mult, div, acc,
+                       CLK_FIXED_FACTOR_FIXED_ACCURACY, true);
+}
+EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor_with_accuracy_fwname);
+
 #ifdef CONFIG_OF
 static struct clk_hw *_of_fixed_factor_clk_setup(struct device_node *node)
 {
        struct clk_hw *hw;
        const char *clk_name = node->name;
+       const struct clk_parent_data pdata = { .index = 0 };
        u32 div, mult;
        int ret;
 
@@ -280,8 +337,8 @@ static struct clk_hw *_of_fixed_factor_clk_setup(struct device_node *node)
 
        of_property_read_string(node, "clock-output-names", &clk_name);
 
-       hw = __clk_hw_register_fixed_factor(NULL, node, clk_name, NULL, NULL, 0,
-                                           0, mult, div, 0, 0, false);
+       hw = __clk_hw_register_fixed_factor(NULL, node, clk_name, NULL, NULL,
+                                           &pdata, 0, mult, div, 0, 0, false);
        if (IS_ERR(hw)) {
                /*
                 * Clear OF_POPULATED flag so that clock registration can be

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 7ddc952c8c6718e8fffa782d57cd352fc894bf8a..4a537260f6557d0ab27d4ba382ab96d37dfa180f 100644 (file)
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -1116,10 +1116,24 @@ void clk_unregister_fixed_factor(struct clk *clk);
 struct clk_hw *clk_hw_register_fixed_factor(struct device *dev,
                const char *name, const char *parent_name, unsigned long flags,
                unsigned int mult, unsigned int div);
+struct clk_hw *clk_hw_register_fixed_factor_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div);
+struct clk_hw *clk_hw_register_fixed_factor_with_accuracy_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div,
+               unsigned long acc);
 void clk_hw_unregister_fixed_factor(struct clk_hw *hw);
 struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev,
                const char *name, const char *parent_name, unsigned long flags,
                unsigned int mult, unsigned int div);
+struct clk_hw *devm_clk_hw_register_fixed_factor_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div);
+struct clk_hw *devm_clk_hw_register_fixed_factor_with_accuracy_fwname(struct device *dev,
+               struct device_node *np, const char *name, const char *fw_name,
+               unsigned long flags, unsigned int mult, unsigned int div,
+               unsigned long acc);
 struct clk_hw *devm_clk_hw_register_fixed_factor_index(struct device *dev,
                const char *name, unsigned int index, unsigned long flags,
                unsigned int mult, unsigned int div);