superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clk: remove round_rate() clk ops 

The round_rate() clk ops is deprecated, and all in tree drivers have
been converted, so let's go ahead and remove any references to the
round_rate() clk ops.

Signed-off-by: Brian Masney <bmasney@redhat.com>
master
Brian Masney 2025-12-12 08:41:42 +09:00
parent 4ce1f19e52
commit dc652a33cf
3 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/driver-api/clk.rst
View File

@ -77,9 +77,6 @@ the operations defined in clk-provider.h::
void (*disable_unused)(struct clk_hw *hw); void (*disable_unused)(struct clk_hw *hw);
unsigned long (*recalc_rate)(struct clk_hw *hw, unsigned long (*recalc_rate)(struct clk_hw *hw,
unsigned long parent_rate); unsigned long parent_rate);
long (*round_rate)(struct clk_hw *hw,
unsigned long rate,
unsigned long *parent_rate);
int (*determine_rate)(struct clk_hw *hw, int (*determine_rate)(struct clk_hw *hw,
struct clk_rate_request *req); struct clk_rate_request *req);
int (*set_parent)(struct clk_hw *hw, u8 index); int (*set_parent)(struct clk_hw *hw, u8 index);
@ -220,9 +217,7 @@ optional or must be evaluated on a case-by-case basis.
+----------------+------+-------------+---------------+-------------+------+ +----------------+------+-------------+---------------+-------------+------+
|.recalc_rate | | y | | | | |.recalc_rate | | y | | | |
+----------------+------+-------------+---------------+-------------+------+ +----------------+------+-------------+---------------+-------------+------+
|.round_rate | | y [1]_ | | | | |.determine_rate | | y | | | |
+----------------+------+-------------+---------------+-------------+------+
|.determine_rate | | y [1]_ | | | |
+----------------+------+-------------+---------------+-------------+------+ +----------------+------+-------------+---------------+-------------+------+
|.set_rate | | y | | | | |.set_rate | | y | | | |
+----------------+------+-------------+---------------+-------------+------+ +----------------+------+-------------+---------------+-------------+------+
@ -238,8 +233,6 @@ optional or must be evaluated on a case-by-case basis.
|.init | | | | | | |.init | | | | | |
+----------------+------+-------------+---------------+-------------+------+ +----------------+------+-------------+---------------+-------------+------+
.. [1] either one of round_rate or determine_rate is required.
Finally, register your clock at run-time with a hardware-specific Finally, register your clock at run-time with a hardware-specific
registration function. This function simply populates struct clk_foo's registration function. This function simply populates struct clk_foo's
data and then passes the common struct clk parameters to the framework data and then passes the common struct clk parameters to the framework

39
drivers/clk/clk.c
View File

@ -1560,8 +1560,6 @@ late_initcall_sync(clk_disable_unused);
static int clk_core_determine_round_nolock(struct clk_core *core, static int clk_core_determine_round_nolock(struct clk_core *core,
struct clk_rate_request *req) struct clk_rate_request *req)
{ {
long rate;
lockdep_assert_held(&prepare_lock); lockdep_assert_held(&prepare_lock);
if (!core) if (!core)
@ -1591,13 +1589,6 @@ static int clk_core_determine_round_nolock(struct clk_core *core,
req->rate = core->rate; req->rate = core->rate;
} else if (core->ops->determine_rate) { } else if (core->ops->determine_rate) {
return core->ops->determine_rate(core->hw, req); return core->ops->determine_rate(core->hw, req);
} else if (core->ops->round_rate) {
rate = core->ops->round_rate(core->hw, req->rate,
&req->best_parent_rate);
if (rate < 0)
return rate;
req->rate = rate;
} else { } else {
return -EINVAL; return -EINVAL;
} }
@ -1682,7 +1673,7 @@ EXPORT_SYMBOL_GPL(clk_hw_forward_rate_request);
static bool clk_core_can_round(struct clk_core * const core) static bool clk_core_can_round(struct clk_core * const core)
{ {
return core->ops->determine_rate || core->ops->round_rate; return core->ops->determine_rate;
} }
static int clk_core_round_rate_nolock(struct clk_core *core, static int clk_core_round_rate_nolock(struct clk_core *core,
@ -1750,11 +1741,11 @@ EXPORT_SYMBOL_GPL(__clk_determine_rate);
* use. * use.
* *
* Context: prepare_lock must be held. * Context: prepare_lock must be held.
* For clk providers to call from within clk_ops such as .round_rate, * For clk providers to call from within clk_ops such as
* .determine_rate. * .determine_rate.
* *
* Return: returns rounded rate of hw clk if clk supports round_rate operation * Return: returns rounded rate of hw clk if clk supports determine_rate
* else returns the parent rate. * operation; else returns the parent rate.
*/ */
unsigned long clk_hw_round_rate(struct clk_hw *hw, unsigned long rate) unsigned long clk_hw_round_rate(struct clk_hw *hw, unsigned long rate)
{ {
@ -2569,12 +2560,13 @@ err:
* *
* Setting the CLK_SET_RATE_PARENT flag allows the rate change operation to * Setting the CLK_SET_RATE_PARENT flag allows the rate change operation to
* propagate up to clk's parent; whether or not this happens depends on the * propagate up to clk's parent; whether or not this happens depends on the
* outcome of clk's .round_rate implementation. If *parent_rate is unchanged * outcome of clk's .determine_rate implementation. If req->best_parent_rate
* after calling .round_rate then upstream parent propagation is ignored. If * is unchanged after calling .determine_rate then upstream parent propagation
* *parent_rate comes back with a new rate for clk's parent then we propagate * is ignored. If req->best_parent_rate comes back with a new rate for clk's
* up to clk's parent and set its rate. Upward propagation will continue * parent then we propagate up to clk's parent and set its rate. Upward
* until either a clk does not support the CLK_SET_RATE_PARENT flag or * propagation will continue until either a clk does not support the
* .round_rate stops requesting changes to clk's parent_rate. * CLK_SET_RATE_PARENT flag or .determine_rate stops requesting changes to
* clk's parent_rate.
* *
* Rate changes are accomplished via tree traversal that also recalculates the * Rate changes are accomplished via tree traversal that also recalculates the
* rates for the clocks and fires off POST_RATE_CHANGE notifiers. * rates for the clocks and fires off POST_RATE_CHANGE notifiers.
@ -2703,8 +2695,6 @@ static int clk_set_rate_range_nolock(struct clk *clk,
* FIXME: * FIXME:
* There is a catch. It may fail for the usual reason (clock * There is a catch. It may fail for the usual reason (clock
* broken, clock protected, etc) but also because: * broken, clock protected, etc) but also because:
* - round_rate() was not favorable and fell on the wrong
* side of the boundary
* - the determine_rate() callback does not really check for * - the determine_rate() callback does not really check for
* this corner case when determining the rate * this corner case when determining the rate
*/ */
@ -3915,10 +3905,9 @@ static int __clk_core_init(struct clk_core *core)
} }
/* check that clk_ops are sane. See Documentation/driver-api/clk.rst */ /* check that clk_ops are sane. See Documentation/driver-api/clk.rst */
if (core->ops->set_rate && if (core->ops->set_rate && !core->ops->determine_rate &&
!((core->ops->round_rate || core->ops->determine_rate) && core->ops->recalc_rate) {
core->ops->recalc_rate)) { pr_err("%s: %s must implement .determine_rate in addition to .recalc_rate\n",
pr_err("%s: %s must implement .round_rate or .determine_rate in addition to .recalc_rate\n",
__func__, core->name); __func__, core->name);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;

18
include/linux/clk-provider.h
View File

@ -136,10 +136,6 @@ struct clk_duty {
* 0. Returns the calculated rate. Optional, but recommended - if * 0. Returns the calculated rate. Optional, but recommended - if
* this op is not set then clock rate will be initialized to 0. * this op is not set then clock rate will be initialized to 0.
* *
* @round_rate: Given a target rate as input, returns the closest rate actually
* supported by the clock. The parent rate is an input/output
* parameter.
*
* @determine_rate: Given a target rate as input, returns the closest rate * @determine_rate: Given a target rate as input, returns the closest rate
* actually supported by the clock, and optionally the parent clock * actually supported by the clock, and optionally the parent clock
* that should be used to provide the clock rate. * that should be used to provide the clock rate.
@ -163,13 +159,13 @@ struct clk_duty {
* *
* @set_rate: Change the rate of this clock. The requested rate is specified * @set_rate: Change the rate of this clock. The requested rate is specified
* by the second argument, which should typically be the return * by the second argument, which should typically be the return
* of .round_rate call. The third argument gives the parent rate * of .determine_rate call. The third argument gives the parent
* which is likely helpful for most .set_rate implementation. * rate which is likely helpful for most .set_rate implementation.
* Returns 0 on success, -EERROR otherwise. * Returns 0 on success, -EERROR otherwise.
* *
* @set_rate_and_parent: Change the rate and the parent of this clock. The * @set_rate_and_parent: Change the rate and the parent of this clock. The
* requested rate is specified by the second argument, which * requested rate is specified by the second argument, which
* should typically be the return of .round_rate call. The * should typically be the return of clk_round_rate() call. The
* third argument gives the parent rate which is likely helpful * third argument gives the parent rate which is likely helpful
* for most .set_rate_and_parent implementation. The fourth * for most .set_rate_and_parent implementation. The fourth
* argument gives the parent index. This callback is optional (and * argument gives the parent index. This callback is optional (and
@ -244,8 +240,6 @@ struct clk_ops {
void (*restore_context)(struct clk_hw *hw); void (*restore_context)(struct clk_hw *hw);
unsigned long (*recalc_rate)(struct clk_hw *hw, unsigned long (*recalc_rate)(struct clk_hw *hw,
unsigned long parent_rate); unsigned long parent_rate);
long (*round_rate)(struct clk_hw *hw, unsigned long rate,
unsigned long *parent_rate);
int (*determine_rate)(struct clk_hw *hw, int (*determine_rate)(struct clk_hw *hw,
struct clk_rate_request *req); struct clk_rate_request *req);
int (*set_parent)(struct clk_hw *hw, u8 index); int (*set_parent)(struct clk_hw *hw, u8 index);
@ -679,7 +673,7 @@ struct clk_div_table {
* @lock: register lock * @lock: register lock
* *
* Clock with an adjustable divider affecting its output frequency. Implements * Clock with an adjustable divider affecting its output frequency. Implements
* .recalc_rate, .set_rate and .round_rate * .recalc_rate, .set_rate and .determine_rate
* *
* @flags: * @flags:
* CLK_DIVIDER_ONE_BASED - by default the divisor is the value read from the * CLK_DIVIDER_ONE_BASED - by default the divisor is the value read from the
@ -1126,7 +1120,7 @@ void of_fixed_factor_clk_setup(struct device_node *node);
* *
* Clock with a fixed multiplier and divider. The output frequency is the * Clock with a fixed multiplier and divider. The output frequency is the
* parent clock rate divided by div and multiplied by mult. * parent clock rate divided by div and multiplied by mult.
* Implements .recalc_rate, .set_rate, .round_rate and .recalc_accuracy * Implements .recalc_rate, .set_rate, .determine_rate and .recalc_accuracy
* *
* Flags: * Flags:
* * CLK_FIXED_FACTOR_FIXED_ACCURACY - Use the value in @acc instead of the * * CLK_FIXED_FACTOR_FIXED_ACCURACY - Use the value in @acc instead of the
@ -1254,7 +1248,7 @@ void clk_hw_unregister_fractional_divider(struct clk_hw *hw);
* @lock: register lock * @lock: register lock
* *
* Clock with an adjustable multiplier affecting its output frequency. * Clock with an adjustable multiplier affecting its output frequency.
* Implements .recalc_rate, .set_rate and .round_rate * Implements .recalc_rate, .set_rate and .determine_rate
* *
* @flags: * @flags:
* CLK_MULTIPLIER_ZERO_BYPASS - By default, the multiplier is the value read * CLK_MULTIPLIER_ZERO_BYPASS - By default, the multiplier is the value read