2 files changed, 30 insertions, 2 deletions

diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index eb3f84bc5325..cc9972d1429c 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -103,9 +103,9 @@ struct clk {
         DEFINE_CLK(_name, clk_gate_ops, _flags,                 \
                         _name##_parent_names, _name##_parents);
 
-#define DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr,    \
+#define _DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr,   \
                                 _flags, _reg, _shift, _width,   \
-                                _divider_flags, _lock)          \
+                                _divider_flags, _table, _lock)  \
         static struct clk _name;                                \
         static const char *_name##_parent_names[] = {           \
                 _parent_name,                                   \
@@ -121,11 +121,27 @@ struct clk {
                 .shift = _shift,                                \
                 .width = _width,                                \
                 .flags = _divider_flags,                        \
+                .table = _table,                                \
                 .lock = _lock,                                  \
         };                                                      \
         DEFINE_CLK(_name, clk_divider_ops, _flags,              \
                         _name##_parent_names, _name##_parents);
 
+#define DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr,    \
+                                _flags, _reg, _shift, _width,   \
+                                _divider_flags, _lock)          \
+        _DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr,   \
+                                _flags, _reg, _shift, _width,   \
+                                _divider_flags, NULL, _lock)
+
+#define DEFINE_CLK_DIVIDER_TABLE(_name, _parent_name,           \
+                                _parent_ptr, _flags, _reg,      \
+                                _shift, _width, _divider_flags, \
+                                _table, _lock)                  \
+        _DEFINE_CLK_DIVIDER(_name, _parent_name, _parent_ptr,   \
+                                _flags, _reg, _shift, _width,   \
+                                _divider_flags, _table, _lock)  \
+
 #define DEFINE_CLK_MUX(_name, _parent_names, _parents, _flags,  \
                                 _reg, _shift, _width,           \
                                 _mux_flags, _lock)              \
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 4a0b483986c3..79caee9f1489 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -203,6 +203,11 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
                 void __iomem *reg, u8 bit_idx,
                 u8 clk_gate_flags, spinlock_t *lock);
 
+struct clk_div_table {
+        unsigned int    val;
+        unsigned int    div;
+};
+
 /**
  * struct clk_divider - adjustable divider clock
  *
@@ -210,6 +215,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
  * @reg:        register containing the divider
  * @shift:      shift to the divider bit field
  * @width:      width of the divider bit field
+ * @table:      array of value/divider pairs, last entry should have div = 0
  * @lock:       register lock
  *
  * Clock with an adjustable divider affecting its output frequency.  Implements
@@ -229,6 +235,7 @@ struct clk_divider {
         u8              shift;
         u8              width;
         u8              flags;
+        const struct clk_div_table      *table;
         spinlock_t      *lock;
 };
 
@@ -240,6 +247,11 @@ struct clk *clk_register_divider(struct device *dev, const char *name,
                 const char *parent_name, unsigned long flags,
                 void __iomem *reg, u8 shift, u8 width,
                 u8 clk_divider_flags, spinlock_t *lock);
+struct clk *clk_register_divider_table(struct device *dev, const char *name,
+                const char *parent_name, unsigned long flags,
+                void __iomem *reg, u8 shift, u8 width,
+                u8 clk_divider_flags, const struct clk_div_table *table,
+                spinlock_t *lock);
 
 /**
  * struct clk_mux - multiplexer clock