Commit 2d34f09e authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: fixed-rate: Add support for specifying parents via DT/pointers 



After commit fc0c209c ("clk: Allow parents to be specified without
string names") we can use DT or direct clk_hw pointers to specify
parents. Create a generic function that shouldn't be used very often to
encode the multitude of ways of registering a fixed rate clk with
different parent information. Then add a bunch of wrapper macros that
only pass down what needs to be passed down to the generic function to
support this with less arguments.

Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Link: https://lkml.kernel.org/r/20190830150923.259497-7-sboyd@kernel.org
parent 32205b75

drivers/clk/clk-fixed-rate.c

+20 −36
Original line number Diff line number Diff line
@@ -44,24 +44,17 @@ const struct clk_ops clk_fixed_rate_ops = { 
};

EXPORT_SYMBOL_GPL(clk_fixed_rate_ops);



/**

 * clk_hw_register_fixed_rate_with_accuracy - register fixed-rate clock with

 * the clock framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_name: name of clock's parent

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 * @fixed_accuracy: non-adjustable clock rate

 */

struct clk_hw *clk_hw_register_fixed_rate_with_accuracy(struct device *dev,

		const char *name, const char *parent_name, unsigned long flags,

		unsigned long fixed_rate, unsigned long fixed_accuracy)

struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,

		struct device_node *np, const char *name,

		const char *parent_name, const struct clk_hw *parent_hw,

		const struct clk_parent_data *parent_data, unsigned long flags,

		unsigned long fixed_rate, unsigned long fixed_accuracy,

		unsigned long clk_fixed_flags)

{

	struct clk_fixed_rate *fixed;

	struct clk_hw *hw;

	struct clk_init_data init = {};

	int ret;

	int ret = -EINVAL;



	/* allocate fixed-rate clock */

	fixed = kzalloc(sizeof(*fixed), GFP_KERNEL);
@@ -71,17 +64,26 @@ struct clk_hw *clk_hw_register_fixed_rate_with_accuracy(struct device *dev, 
	init.name = name;

	init.ops = &clk_fixed_rate_ops;

	init.flags = flags;

	init.parent_names = (parent_name ? &parent_name: NULL);

	init.num_parents = (parent_name ? 1 : 0);

	init.parent_names = parent_name ? &parent_name : NULL;

	init.parent_hws = parent_hw ? &parent_hw : NULL;

	init.parent_data = parent_data;

	if (parent_name || parent_hw || parent_data)

		init.num_parents = 1;

	else

		init.num_parents = 0;



	/* struct clk_fixed_rate assignments */

	fixed->flags = clk_fixed_flags;

	fixed->fixed_rate = fixed_rate;

	fixed->fixed_accuracy = fixed_accuracy;

	fixed->hw.init = &init;



	/* register the clock */

	hw = &fixed->hw;

	if (dev || !np)

		ret = clk_hw_register(dev, hw);

	else if (np)

		ret = of_clk_hw_register(np, hw);

	if (ret) {

		kfree(fixed);

		hw = ERR_PTR(ret);
@@ -89,25 +91,7 @@ struct clk_hw *clk_hw_register_fixed_rate_with_accuracy(struct device *dev, 


	return hw;

}

EXPORT_SYMBOL_GPL(clk_hw_register_fixed_rate_with_accuracy);



/**

 * clk_hw_register_fixed_rate - register fixed-rate clock with the clock

 * framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_name: name of clock's parent

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 */

struct clk_hw *clk_hw_register_fixed_rate(struct device *dev, const char *name,

		const char *parent_name, unsigned long flags,

		unsigned long fixed_rate)

{

	return clk_hw_register_fixed_rate_with_accuracy(dev, name, parent_name,

						     flags, fixed_rate, 0);

}

EXPORT_SYMBOL_GPL(clk_hw_register_fixed_rate);

EXPORT_SYMBOL_GPL(__clk_hw_register_fixed_rate);



struct clk *clk_register_fixed_rate(struct device *dev, const char *name,

		const char *parent_name, unsigned long flags,

include/linux/clk-provider.h

+94 −6
Original line number Diff line number Diff line
@@ -322,24 +322,112 @@ struct clk_hw { 
 * @hw:		handle between common and hardware-specific interfaces

 * @fixed_rate:	constant frequency of clock

 * @fixed_accuracy: constant accuracy of clock in ppb (parts per billion)

 * @flags:	hardware specific flags

 */

struct clk_fixed_rate {

	struct		clk_hw hw;

	unsigned long	fixed_rate;

	unsigned long	fixed_accuracy;

	unsigned long	flags;

};



extern const struct clk_ops clk_fixed_rate_ops;

struct clk_hw *__clk_hw_register_fixed_rate(struct device *dev,

		struct device_node *np, const char *name,

		const char *parent_name, const struct clk_hw *parent_hw,

		const struct clk_parent_data *parent_data, unsigned long flags,

		unsigned long fixed_rate, unsigned long fixed_accuracy,

		unsigned long clk_fixed_flags);

struct clk *clk_register_fixed_rate(struct device *dev, const char *name,

		const char *parent_name, unsigned long flags,

		unsigned long fixed_rate);

struct clk_hw *clk_hw_register_fixed_rate(struct device *dev, const char *name,

		const char *parent_name, unsigned long flags,

		unsigned long fixed_rate);

/**

 * clk_hw_register_fixed_rate - register fixed-rate clock with the clock

 * framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_name: name of clock's parent

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 */

#define clk_hw_register_fixed_rate(dev, name, parent_name, flags, fixed_rate)  \

	__clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name), NULL, \

				     NULL, (flags), (fixed_rate), 0, 0)

/**

 * clk_hw_register_fixed_rate_parent_hw - register fixed-rate clock with

 * the clock framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_hw: pointer to parent clk

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 */

#define clk_hw_register_fixed_rate_parent_hw(dev, name, parent_hw, flags,     \

					     fixed_rate)		      \

	__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw),  \

				     NULL, (flags), (fixed_rate), 0, 0)

/**

 * clk_hw_register_fixed_rate_parent_data - register fixed-rate clock with

 * the clock framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_data: parent clk data

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 */

#define clk_hw_register_fixed_rate_parent_data(dev, name, parent_hw, flags,   \

					     fixed_rate)		      \

	__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL,	      \

				     (parent_data), (flags), (fixed_rate), 0, \

				     0)

/**

 * clk_hw_register_fixed_rate_with_accuracy - register fixed-rate clock with

 * the clock framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_name: name of clock's parent

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 * @fixed_accuracy: non-adjustable clock rate

 */

#define clk_hw_register_fixed_rate_with_accuracy(dev, name, parent_name,      \

						 flags, fixed_rate,	      \

						 fixed_accuracy)	      \

	__clk_hw_register_fixed_rate((dev), NULL, (name), (parent_name),      \

				     NULL, NULL, (flags), (fixed_rate),       \

				     (fixed_accuracy), 0)

/**

 * clk_hw_register_fixed_rate_with_accuracy_parent_hw - register fixed-rate

 * clock with the clock framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_hw: pointer to parent clk

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 * @fixed_accuracy: non-adjustable clock accuracy

 */

#define clk_hw_register_fixed_rate_with_accuracy_parent_hw(dev, name,	      \

		parent_hw, flags, fixed_rate, fixed_accuracy)		      \

	__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, (parent_hw)   \

				     NULL, NULL, (flags), (fixed_rate),	      \

				     (fixed_accuracy), 0)

/**

 * clk_hw_register_fixed_rate_with_accuracy_parent_data - register fixed-rate

 * clock with the clock framework

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_name: name of clock's parent

 * @flags: framework-specific flags

 * @fixed_rate: non-adjustable clock rate

 * @fixed_accuracy: non-adjustable clock accuracy

 */

#define clk_hw_register_fixed_rate_with_accuracy_parent_data(dev, name,	      \

		parent_data, flags, fixed_rate, fixed_accuracy)		      \

	__clk_hw_register_fixed_rate((dev), NULL, (name), NULL, NULL,	      \

				     (parent_data), NULL, (flags),	      \

				     (fixed_rate), (fixed_accuracy), 0)



void clk_unregister_fixed_rate(struct clk *clk);

struct clk_hw *clk_hw_register_fixed_rate_with_accuracy(struct device *dev,

		const char *name, const char *parent_name, unsigned long flags,

		unsigned long fixed_rate, unsigned long fixed_accuracy);

void clk_hw_unregister_fixed_rate(struct clk_hw *hw);



void of_fixed_clk_setup(struct device_node *np);

CRA Git | Maintained and supported by SUSTech CRA and CCSE