.. | .. |
---|
28 | 28 | unsigned long *prate) |
---|
29 | 29 | { |
---|
30 | 30 | struct mmp_clk_factor *factor = to_clk_factor(hw); |
---|
31 | | - unsigned long rate = 0, prev_rate; |
---|
| 31 | + u64 rate = 0, prev_rate; |
---|
32 | 32 | int i; |
---|
33 | 33 | |
---|
34 | 34 | for (i = 0; i < factor->ftbl_cnt; i++) { |
---|
35 | 35 | prev_rate = rate; |
---|
36 | | - rate = (((*prate / 10000) * factor->ftbl[i].den) / |
---|
37 | | - (factor->ftbl[i].num * factor->masks->factor)) * 10000; |
---|
| 36 | + rate = *prate; |
---|
| 37 | + rate *= factor->ftbl[i].den; |
---|
| 38 | + do_div(rate, factor->ftbl[i].num * factor->masks->factor); |
---|
| 39 | + |
---|
38 | 40 | if (rate > drate) |
---|
39 | 41 | break; |
---|
40 | 42 | } |
---|
.. | .. |
---|
54 | 56 | struct mmp_clk_factor *factor = to_clk_factor(hw); |
---|
55 | 57 | struct mmp_clk_factor_masks *masks = factor->masks; |
---|
56 | 58 | unsigned int val, num, den; |
---|
| 59 | + u64 rate; |
---|
57 | 60 | |
---|
58 | 61 | val = readl_relaxed(factor->base); |
---|
59 | 62 | |
---|
.. | .. |
---|
66 | 69 | if (!den) |
---|
67 | 70 | return 0; |
---|
68 | 71 | |
---|
69 | | - return (((parent_rate / 10000) * den) / |
---|
70 | | - (num * factor->masks->factor)) * 10000; |
---|
| 72 | + rate = parent_rate; |
---|
| 73 | + rate *= den; |
---|
| 74 | + do_div(rate, num * factor->masks->factor); |
---|
| 75 | + |
---|
| 76 | + return rate; |
---|
71 | 77 | } |
---|
72 | 78 | |
---|
73 | 79 | /* Configures new clock rate*/ |
---|
.. | .. |
---|
78 | 84 | struct mmp_clk_factor_masks *masks = factor->masks; |
---|
79 | 85 | int i; |
---|
80 | 86 | unsigned long val; |
---|
81 | | - unsigned long prev_rate, rate = 0; |
---|
82 | 87 | unsigned long flags = 0; |
---|
| 88 | + u64 rate = 0; |
---|
83 | 89 | |
---|
84 | 90 | for (i = 0; i < factor->ftbl_cnt; i++) { |
---|
85 | | - prev_rate = rate; |
---|
86 | | - rate = (((prate / 10000) * factor->ftbl[i].den) / |
---|
87 | | - (factor->ftbl[i].num * factor->masks->factor)) * 10000; |
---|
| 91 | + rate = prate; |
---|
| 92 | + rate *= factor->ftbl[i].den; |
---|
| 93 | + do_div(rate, factor->ftbl[i].num * factor->masks->factor); |
---|
| 94 | + |
---|
88 | 95 | if (rate > drate) |
---|
89 | 96 | break; |
---|
90 | 97 | } |
---|
.. | .. |
---|
110 | 117 | return 0; |
---|
111 | 118 | } |
---|
112 | 119 | |
---|
113 | | -static void clk_factor_init(struct clk_hw *hw) |
---|
| 120 | +static int clk_factor_init(struct clk_hw *hw) |
---|
114 | 121 | { |
---|
115 | 122 | struct mmp_clk_factor *factor = to_clk_factor(hw); |
---|
116 | 123 | struct mmp_clk_factor_masks *masks = factor->masks; |
---|
.. | .. |
---|
141 | 148 | val &= ~(masks->den_mask << masks->den_shift); |
---|
142 | 149 | val |= (factor->ftbl[0].den & masks->den_mask) << |
---|
143 | 150 | masks->den_shift; |
---|
| 151 | + } |
---|
144 | 152 | |
---|
| 153 | + if (!(val & masks->enable_mask) || i >= factor->ftbl_cnt) { |
---|
| 154 | + val |= masks->enable_mask; |
---|
145 | 155 | writel(val, factor->base); |
---|
146 | 156 | } |
---|
147 | 157 | |
---|
148 | 158 | if (factor->lock) |
---|
149 | 159 | spin_unlock_irqrestore(factor->lock, flags); |
---|
| 160 | + |
---|
| 161 | + return 0; |
---|
150 | 162 | } |
---|
151 | 163 | |
---|
152 | 164 | static const struct clk_ops clk_factor_ops = { |
---|
.. | .. |
---|
163 | 175 | unsigned int ftbl_cnt, spinlock_t *lock) |
---|
164 | 176 | { |
---|
165 | 177 | struct mmp_clk_factor *factor; |
---|
166 | | - struct clk_init_data init = {}; |
---|
| 178 | + struct clk_init_data init; |
---|
167 | 179 | struct clk *clk; |
---|
168 | 180 | |
---|
169 | 181 | if (!masks) { |
---|