|
@@ -1658,16 +1658,37 @@ static void clk_change_rate(struct clk_core *core)
|
|
clk_change_rate(core->new_child);
|
|
clk_change_rate(core->new_child);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static unsigned long clk_core_req_round_rate_nolock(struct clk_core *core,
|
|
|
|
+ unsigned long req_rate)
|
|
|
|
+{
|
|
|
|
+ int ret;
|
|
|
|
+ struct clk_rate_request req;
|
|
|
|
+
|
|
|
|
+ lockdep_assert_held(&prepare_lock);
|
|
|
|
+
|
|
|
|
+ if (!core)
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ clk_core_get_boundaries(core, &req.min_rate, &req.max_rate);
|
|
|
|
+ req.rate = req_rate;
|
|
|
|
+
|
|
|
|
+ ret = clk_core_round_rate_nolock(core, &req);
|
|
|
|
+
|
|
|
|
+ return ret ? 0 : req.rate;
|
|
|
|
+}
|
|
|
|
+
|
|
static int clk_core_set_rate_nolock(struct clk_core *core,
|
|
static int clk_core_set_rate_nolock(struct clk_core *core,
|
|
unsigned long req_rate)
|
|
unsigned long req_rate)
|
|
{
|
|
{
|
|
struct clk_core *top, *fail_clk;
|
|
struct clk_core *top, *fail_clk;
|
|
- unsigned long rate = req_rate;
|
|
|
|
|
|
+ unsigned long rate;
|
|
int ret = 0;
|
|
int ret = 0;
|
|
|
|
|
|
if (!core)
|
|
if (!core)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
+ rate = clk_core_req_round_rate_nolock(core, req_rate);
|
|
|
|
+
|
|
/* bail early if nothing to do */
|
|
/* bail early if nothing to do */
|
|
if (rate == clk_core_get_rate_nolock(core))
|
|
if (rate == clk_core_get_rate_nolock(core))
|
|
return 0;
|
|
return 0;
|
|
@@ -1676,7 +1697,7 @@ static int clk_core_set_rate_nolock(struct clk_core *core,
|
|
return -EBUSY;
|
|
return -EBUSY;
|
|
|
|
|
|
/* calculate new rates and get the topmost changed clock */
|
|
/* calculate new rates and get the topmost changed clock */
|
|
- top = clk_calc_new_rates(core, rate);
|
|
|
|
|
|
+ top = clk_calc_new_rates(core, req_rate);
|
|
if (!top)
|
|
if (!top)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
|
|
|