|
@@ -24,7 +24,7 @@
|
|
* Traits of this clock:
|
|
* Traits of this clock:
|
|
* prepare - clk_prepare only ensures that parents are prepared
|
|
* prepare - clk_prepare only ensures that parents are prepared
|
|
* enable - clk_enable only ensures that parents are enabled
|
|
* enable - clk_enable only ensures that parents are enabled
|
|
- * rate - rate is adjustable. clk->rate = parent->rate / divisor
|
|
|
|
|
|
+ * rate - rate is adjustable. clk->rate = DIV_ROUND_UP(parent->rate / divisor)
|
|
* parent - fixed parent. No clk_set_parent support
|
|
* parent - fixed parent. No clk_set_parent support
|
|
*/
|
|
*/
|
|
|
|
|
|
@@ -115,7 +115,7 @@ static unsigned long clk_divider_recalc_rate(struct clk_hw *hw,
|
|
return parent_rate;
|
|
return parent_rate;
|
|
}
|
|
}
|
|
|
|
|
|
- return parent_rate / div;
|
|
|
|
|
|
+ return DIV_ROUND_UP(parent_rate, div);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -185,7 +185,7 @@ static int clk_divider_bestdiv(struct clk_hw *hw, unsigned long rate,
|
|
}
|
|
}
|
|
parent_rate = __clk_round_rate(__clk_get_parent(hw->clk),
|
|
parent_rate = __clk_round_rate(__clk_get_parent(hw->clk),
|
|
MULT_ROUND_UP(rate, i));
|
|
MULT_ROUND_UP(rate, i));
|
|
- now = parent_rate / i;
|
|
|
|
|
|
+ now = DIV_ROUND_UP(parent_rate, i);
|
|
if (now <= rate && now > best) {
|
|
if (now <= rate && now > best) {
|
|
bestdiv = i;
|
|
bestdiv = i;
|
|
best = now;
|
|
best = now;
|
|
@@ -207,7 +207,7 @@ static long clk_divider_round_rate(struct clk_hw *hw, unsigned long rate,
|
|
int div;
|
|
int div;
|
|
div = clk_divider_bestdiv(hw, rate, prate);
|
|
div = clk_divider_bestdiv(hw, rate, prate);
|
|
|
|
|
|
- return *prate / div;
|
|
|
|
|
|
+ return DIV_ROUND_UP(*prate, div);
|
|
}
|
|
}
|
|
|
|
|
|
static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
@@ -218,7 +218,7 @@ static int clk_divider_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
unsigned long flags = 0;
|
|
unsigned long flags = 0;
|
|
u32 val;
|
|
u32 val;
|
|
|
|
|
|
- div = parent_rate / rate;
|
|
|
|
|
|
+ div = DIV_ROUND_UP(parent_rate, rate);
|
|
value = _get_val(divider, div);
|
|
value = _get_val(divider, div);
|
|
|
|
|
|
if (value > div_mask(divider))
|
|
if (value > div_mask(divider))
|