1 files changed, 42 insertions, 1 deletions

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 7c925e6211f1..f711be6e8c44 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -20,6 +20,8 @@
  * flags used across common struct clk.  these flags should only affect the
  * top-level framework.  custom flags for dealing with hardware specifics
  * belong in struct clk_foo
+ *
+ * Please update clk_flags[] in drivers/clk/clk.c when making changes here!
  */
 #define CLK_SET_RATE_GATE       BIT(0) /* must be gated across rate change */
 #define CLK_SET_PARENT_GATE     BIT(1) /* must be gated across re-parent */
@@ -412,7 +414,7 @@ extern const struct clk_ops clk_divider_ro_ops;
 
 unsigned long divider_recalc_rate(struct clk_hw *hw, unsigned long parent_rate,
                 unsigned int val, const struct clk_div_table *table,
-                unsigned long flags);
+                unsigned long flags, unsigned long width);
 long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent,
                                unsigned long rate, unsigned long *prate,
                                const struct clk_div_table *table,
@@ -744,6 +746,7 @@ unsigned long clk_hw_get_rate(const struct clk_hw *hw);
 unsigned long __clk_get_flags(struct clk *clk);
 unsigned long clk_hw_get_flags(const struct clk_hw *hw);
 bool clk_hw_is_prepared(const struct clk_hw *hw);
+bool clk_hw_rate_is_protected(const struct clk_hw *hw);
 bool clk_hw_is_enabled(const struct clk_hw *hw);
 bool __clk_is_enabled(struct clk *clk);
 struct clk *__clk_lookup(const char *name);
@@ -806,6 +809,44 @@ extern struct of_device_id __clk_of_table;
         }                                                               \
         OF_DECLARE_1(clk, name, compat, name##_of_clk_init_driver)
 
+#define CLK_HW_INIT(_name, _parent, _ops, _flags)               \
+        (&(struct clk_init_data) {                              \
+                .flags          = _flags,                       \
+                .name           = _name,                        \
+                .parent_names   = (const char *[]) { _parent }, \
+                .num_parents    = 1,                            \
+                .ops            = _ops,                         \
+        })
+
+#define CLK_HW_INIT_PARENTS(_name, _parents, _ops, _flags)      \
+        (&(struct clk_init_data) {                              \
+                .flags          = _flags,                       \
+                .name           = _name,                        \
+                .parent_names   = _parents,                     \
+                .num_parents    = ARRAY_SIZE(_parents),         \
+                .ops            = _ops,                         \
+        })
+
+#define CLK_HW_INIT_NO_PARENT(_name, _ops, _flags)      \
+        (&(struct clk_init_data) {                      \
+                .flags          = _flags,               \
+                .name           = _name,                \
+                .parent_names   = NULL,                 \
+                .num_parents    = 0,                    \
+                .ops            = _ops,                 \
+        })
+
+#define CLK_FIXED_FACTOR(_struct, _name, _parent,                       \
+                        _div, _mult, _flags)                            \
+        struct clk_fixed_factor _struct = {                             \
+                .div            = _div,                                 \
+                .mult           = _mult,                                \
+                .hw.init        = CLK_HW_INIT(_name,                    \
+                                              _parent,                  \
+                                              &clk_fixed_factor_ops,    \
+                                              _flags),                  \
+        }
+
 #ifdef CONFIG_OF
 int of_clk_add_provider(struct device_node *np,
                         struct clk *(*clk_src_get)(struct of_phandle_args *args,