Merge branch 'clk-bulk-get' into clk-next
* clk-bulk-get: clk: add managed version of clk_bulk_get clk: add clk_bulk_get accessories
This commit is contained in:
@@ -77,6 +77,21 @@ struct clk_notifier_data {
|
||||
unsigned long new_rate;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct clk_bulk_data - Data used for bulk clk operations.
|
||||
*
|
||||
* @id: clock consumer ID
|
||||
* @clk: struct clk * to store the associated clock
|
||||
*
|
||||
* The CLK APIs provide a series of clk_bulk_() API calls as
|
||||
* a convenience to consumers which require multiple clks. This
|
||||
* structure is used to manage data for these calls.
|
||||
*/
|
||||
struct clk_bulk_data {
|
||||
const char *id;
|
||||
struct clk *clk;
|
||||
};
|
||||
|
||||
#ifdef CONFIG_COMMON_CLK
|
||||
|
||||
/**
|
||||
@@ -185,12 +200,20 @@ static inline bool clk_is_match(const struct clk *p, const struct clk *q)
|
||||
*/
|
||||
#ifdef CONFIG_HAVE_CLK_PREPARE
|
||||
int clk_prepare(struct clk *clk);
|
||||
int __must_check clk_bulk_prepare(int num_clks,
|
||||
const struct clk_bulk_data *clks);
|
||||
#else
|
||||
static inline int clk_prepare(struct clk *clk)
|
||||
{
|
||||
might_sleep();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int clk_bulk_prepare(int num_clks, struct clk_bulk_data *clks)
|
||||
{
|
||||
might_sleep();
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
@@ -204,11 +227,16 @@ static inline int clk_prepare(struct clk *clk)
|
||||
*/
|
||||
#ifdef CONFIG_HAVE_CLK_PREPARE
|
||||
void clk_unprepare(struct clk *clk);
|
||||
void clk_bulk_unprepare(int num_clks, const struct clk_bulk_data *clks);
|
||||
#else
|
||||
static inline void clk_unprepare(struct clk *clk)
|
||||
{
|
||||
might_sleep();
|
||||
}
|
||||
static inline void clk_bulk_unprepare(int num_clks, struct clk_bulk_data *clks)
|
||||
{
|
||||
might_sleep();
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_HAVE_CLK
|
||||
@@ -229,6 +257,44 @@ static inline void clk_unprepare(struct clk *clk)
|
||||
*/
|
||||
struct clk *clk_get(struct device *dev, const char *id);
|
||||
|
||||
/**
|
||||
* clk_bulk_get - lookup and obtain a number of references to clock producer.
|
||||
* @dev: device for clock "consumer"
|
||||
* @num_clks: the number of clk_bulk_data
|
||||
* @clks: the clk_bulk_data table of consumer
|
||||
*
|
||||
* This helper function allows drivers to get several clk consumers in one
|
||||
* operation. If any of the clk cannot be acquired then any clks
|
||||
* that were obtained will be freed before returning to the caller.
|
||||
*
|
||||
* Returns 0 if all clocks specified in clk_bulk_data table are obtained
|
||||
* successfully, or valid IS_ERR() condition containing errno.
|
||||
* The implementation uses @dev and @clk_bulk_data.id to determine the
|
||||
* clock consumer, and thereby the clock producer.
|
||||
* The clock returned is stored in each @clk_bulk_data.clk field.
|
||||
*
|
||||
* Drivers must assume that the clock source is not enabled.
|
||||
*
|
||||
* clk_bulk_get should not be called from within interrupt context.
|
||||
*/
|
||||
int __must_check clk_bulk_get(struct device *dev, int num_clks,
|
||||
struct clk_bulk_data *clks);
|
||||
|
||||
/**
|
||||
* devm_clk_bulk_get - managed get multiple clk consumers
|
||||
* @dev: device for clock "consumer"
|
||||
* @num_clks: the number of clk_bulk_data
|
||||
* @clks: the clk_bulk_data table of consumer
|
||||
*
|
||||
* Return 0 on success, an errno on failure.
|
||||
*
|
||||
* This helper function allows drivers to get several clk
|
||||
* consumers in one operation with management, the clks will
|
||||
* automatically be freed when the device is unbound.
|
||||
*/
|
||||
int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
|
||||
struct clk_bulk_data *clks);
|
||||
|
||||
/**
|
||||
* devm_clk_get - lookup and obtain a managed reference to a clock producer.
|
||||
* @dev: device for clock "consumer"
|
||||
@@ -278,6 +344,18 @@ struct clk *devm_get_clk_from_child(struct device *dev,
|
||||
*/
|
||||
int clk_enable(struct clk *clk);
|
||||
|
||||
/**
|
||||
* clk_bulk_enable - inform the system when the set of clks should be running.
|
||||
* @num_clks: the number of clk_bulk_data
|
||||
* @clks: the clk_bulk_data table of consumer
|
||||
*
|
||||
* May be called from atomic contexts.
|
||||
*
|
||||
* Returns success (0) or negative errno.
|
||||
*/
|
||||
int __must_check clk_bulk_enable(int num_clks,
|
||||
const struct clk_bulk_data *clks);
|
||||
|
||||
/**
|
||||
* clk_disable - inform the system when the clock source is no longer required.
|
||||
* @clk: clock source
|
||||
@@ -294,6 +372,24 @@ int clk_enable(struct clk *clk);
|
||||
*/
|
||||
void clk_disable(struct clk *clk);
|
||||
|
||||
/**
|
||||
* clk_bulk_disable - inform the system when the set of clks is no
|
||||
* longer required.
|
||||
* @num_clks: the number of clk_bulk_data
|
||||
* @clks: the clk_bulk_data table of consumer
|
||||
*
|
||||
* Inform the system that a set of clks is no longer required by
|
||||
* a driver and may be shut down.
|
||||
*
|
||||
* May be called from atomic contexts.
|
||||
*
|
||||
* Implementation detail: if the set of clks is shared between
|
||||
* multiple drivers, clk_bulk_enable() calls must be balanced by the
|
||||
* same number of clk_bulk_disable() calls for the clock source to be
|
||||
* disabled.
|
||||
*/
|
||||
void clk_bulk_disable(int num_clks, const struct clk_bulk_data *clks);
|
||||
|
||||
/**
|
||||
* clk_get_rate - obtain the current clock rate (in Hz) for a clock source.
|
||||
* This is only valid once the clock source has been enabled.
|
||||
@@ -313,6 +409,19 @@ unsigned long clk_get_rate(struct clk *clk);
|
||||
*/
|
||||
void clk_put(struct clk *clk);
|
||||
|
||||
/**
|
||||
* clk_bulk_put - "free" the clock source
|
||||
* @num_clks: the number of clk_bulk_data
|
||||
* @clks: the clk_bulk_data table of consumer
|
||||
*
|
||||
* Note: drivers must ensure that all clk_bulk_enable calls made on this
|
||||
* clock source are balanced by clk_bulk_disable calls prior to calling
|
||||
* this function.
|
||||
*
|
||||
* clk_bulk_put should not be called from within interrupt context.
|
||||
*/
|
||||
void clk_bulk_put(int num_clks, struct clk_bulk_data *clks);
|
||||
|
||||
/**
|
||||
* devm_clk_put - "free" a managed clock source
|
||||
* @dev: device used to acquire the clock
|
||||
@@ -445,11 +554,23 @@ static inline struct clk *clk_get(struct device *dev, const char *id)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline int clk_bulk_get(struct device *dev, int num_clks,
|
||||
struct clk_bulk_data *clks)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline struct clk *devm_clk_get(struct device *dev, const char *id)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline int devm_clk_bulk_get(struct device *dev, int num_clks,
|
||||
struct clk_bulk_data *clks)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline struct clk *devm_get_clk_from_child(struct device *dev,
|
||||
struct device_node *np, const char *con_id)
|
||||
{
|
||||
@@ -458,6 +579,8 @@ static inline struct clk *devm_get_clk_from_child(struct device *dev,
|
||||
|
||||
static inline void clk_put(struct clk *clk) {}
|
||||
|
||||
static inline void clk_bulk_put(int num_clks, struct clk_bulk_data *clks) {}
|
||||
|
||||
static inline void devm_clk_put(struct device *dev, struct clk *clk) {}
|
||||
|
||||
static inline int clk_enable(struct clk *clk)
|
||||
@@ -465,8 +588,17 @@ static inline int clk_enable(struct clk *clk)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int clk_bulk_enable(int num_clks, struct clk_bulk_data *clks)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline void clk_disable(struct clk *clk) {}
|
||||
|
||||
|
||||
static inline void clk_bulk_disable(int num_clks,
|
||||
struct clk_bulk_data *clks) {}
|
||||
|
||||
static inline unsigned long clk_get_rate(struct clk *clk)
|
||||
{
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user