Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[karo-tx-linux.git] / include / linux / clk / ti.h

diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index 9a638601cb09f8918c8575e87893c397a64c7a54..dc5164a6df2932f6c3f24e4287e46216f4c38c06 100644 (file)
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -23,8 +23,8 @@
  * @mult_div1_reg: register containing the DPLL M and N bitfields
  * @mult_mask: mask of the DPLL M bitfield in @mult_div1_reg
  * @div1_mask: mask of the DPLL N bitfield in @mult_div1_reg
- * @clk_bypass: struct clk pointer to the clock's bypass clock input
- * @clk_ref: struct clk pointer to the clock's reference clock input
+ * @clk_bypass: struct clk_hw pointer to the clock's bypass clock input
+ * @clk_ref: struct clk_hw pointer to the clock's reference clock input
  * @control_reg: register containing the DPLL mode bitfield
  * @enable_mask: mask of the DPLL mode bitfield in @control_reg
  * @last_rounded_rate: cache of the last rate result of omap2_dpll_round_rate()
@@ -69,8 +69,8 @@ struct dpll_data {
        void __iomem            *mult_div1_reg;
        u32                     mult_mask;
        u32                     div1_mask;
-       struct clk              *clk_bypass;
-       struct clk              *clk_ref;
+       struct clk_hw           *clk_bypass;
+       struct clk_hw           *clk_ref;
        void __iomem            *control_reg;
        u32                     enable_mask;
        unsigned long           last_rounded_rate;