Merge remote-tracking branch 'regulator/fix/qcom-spmi' into regulator-linus

[sfrench/cifs-2.6.git] / include / linux / clk-provider.h

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index c59c62571e4fe6a8c3ec5a9f48759b84c67e6a4a..5100ec1b5d559f93b93a12b320feefe148f23b30 100644 (file)
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -343,6 +343,7 @@ struct clk_hw *clk_hw_register_gate(struct device *dev, const char *name,
                u8 clk_gate_flags, spinlock_t *lock);
 void clk_unregister_gate(struct clk *clk);
 void clk_hw_unregister_gate(struct clk_hw *hw);
+int clk_gate_is_enabled(struct clk_hw *hw);
 
 struct clk_div_table {
        unsigned int    val;
@@ -565,6 +566,9 @@ struct clk_fractional_divider {
        u8              nwidth;
        u32             nmask;
        u8              flags;
+       void            (*approximation)(struct clk_hw *hw,
+                               unsigned long rate, unsigned long *parent_rate,
+                               unsigned long *m, unsigned long *n);
        spinlock_t      *lock;
 };