diff options
Diffstat (limited to 'include/linux/sh_clk.h')
-rw-r--r-- | include/linux/sh_clk.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index a20831cf336a..54341d811685 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h | |||
@@ -49,6 +49,7 @@ struct clk { | |||
49 | 49 | ||
50 | void __iomem *enable_reg; | 50 | void __iomem *enable_reg; |
51 | unsigned int enable_bit; | 51 | unsigned int enable_bit; |
52 | void __iomem *mapped_reg; | ||
52 | 53 | ||
53 | unsigned long arch_flags; | 54 | unsigned long arch_flags; |
54 | void *priv; | 55 | void *priv; |
@@ -131,10 +132,9 @@ int sh_clk_div4_enable_register(struct clk *clks, int nr, | |||
131 | int sh_clk_div4_reparent_register(struct clk *clks, int nr, | 132 | int sh_clk_div4_reparent_register(struct clk *clks, int nr, |
132 | struct clk_div4_table *table); | 133 | struct clk_div4_table *table); |
133 | 134 | ||
134 | #define SH_CLK_DIV6_EXT(_parent, _reg, _flags, _parents, \ | 135 | #define SH_CLK_DIV6_EXT(_reg, _flags, _parents, \ |
135 | _num_parents, _src_shift, _src_width) \ | 136 | _num_parents, _src_shift, _src_width) \ |
136 | { \ | 137 | { \ |
137 | .parent = _parent, \ | ||
138 | .enable_reg = (void __iomem *)_reg, \ | 138 | .enable_reg = (void __iomem *)_reg, \ |
139 | .flags = _flags, \ | 139 | .flags = _flags, \ |
140 | .parent_table = _parents, \ | 140 | .parent_table = _parents, \ |
@@ -144,7 +144,11 @@ int sh_clk_div4_reparent_register(struct clk *clks, int nr, | |||
144 | } | 144 | } |
145 | 145 | ||
146 | #define SH_CLK_DIV6(_parent, _reg, _flags) \ | 146 | #define SH_CLK_DIV6(_parent, _reg, _flags) \ |
147 | SH_CLK_DIV6_EXT(_parent, _reg, _flags, NULL, 0, 0, 0) | 147 | { \ |
148 | .parent = _parent, \ | ||
149 | .enable_reg = (void __iomem *)_reg, \ | ||
150 | .flags = _flags, \ | ||
151 | } | ||
148 | 152 | ||
149 | int sh_clk_div6_register(struct clk *clks, int nr); | 153 | int sh_clk_div6_register(struct clk *clks, int nr); |
150 | int sh_clk_div6_reparent_register(struct clk *clks, int nr); | 154 | int sh_clk_div6_reparent_register(struct clk *clks, int nr); |