Commit 6ebd5247 authored by Marijn Suijten's avatar Marijn Suijten Committed by Stephen Boyd
Browse files

clk: fixed-factor: Introduce *clk_hw_register_fixed_factor_parent_hw() 



Add the devres and non-devres variant of
clk_hw_register_fixed_factor_parent_hw() for registering a fixed factor
clock with clk_hw parent pointer instead of parent name.

Signed-off-by: default avatarMarijn Suijten <marijn.suijten@somainline.org>
Link: https://lore.kernel.org/r/20220629225331.357308-4-marijn.suijten@somainline.org


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent df63af17

drivers/clk/clk-fixed-factor.c

+40 −5
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ static void devm_clk_hw_register_fixed_factor_release(struct device *dev, void * 


static struct clk_hw *

__clk_hw_register_fixed_factor(struct device *dev, struct device_node *np,

		const char *name, const char *parent_name, int index,

		const char *name, const char *parent_name,

		const struct clk_hw *parent_hw, int index,

		unsigned long flags, unsigned int mult, unsigned int div,

		bool devm)

{
@@ -110,6 +111,8 @@ __clk_hw_register_fixed_factor(struct device *dev, struct device_node *np, 
	init.flags = flags;

	if (parent_name)

		init.parent_names = &parent_name;

	else if (parent_hw)

		init.parent_hws = &parent_hw;

	else

		init.parent_data = &pdata;

	init.num_parents = 1;
@@ -148,16 +151,48 @@ struct clk_hw *devm_clk_hw_register_fixed_factor_index(struct device *dev, 
		const char *name, unsigned int index, unsigned long flags,

		unsigned int mult, unsigned int div)

{

	return __clk_hw_register_fixed_factor(dev, NULL, name, NULL, index,

	return __clk_hw_register_fixed_factor(dev, NULL, name, NULL, NULL, index,

					      flags, mult, div, true);

}

EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor_index);



/**

 * devm_clk_hw_register_fixed_factor_parent_hw - Register a fixed factor clock with

 * pointer to parent clock

 * @dev: device that is registering this clock

 * @name: name of this clock

 * @parent_hw: pointer to parent clk

 * @flags: fixed factor flags

 * @mult: multiplier

 * @div: divider

 *

 * Return: Pointer to fixed factor clk_hw structure that was registered or

 * an error pointer.

 */

struct clk_hw *devm_clk_hw_register_fixed_factor_parent_hw(struct device *dev,

		const char *name, const struct clk_hw *parent_hw,

		unsigned long flags, unsigned int mult, unsigned int div)

{

	return __clk_hw_register_fixed_factor(dev, NULL, name, NULL, parent_hw,

					      -1, flags, mult, div, true);

}

EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor_parent_hw);



struct clk_hw *clk_hw_register_fixed_factor_parent_hw(struct device *dev,

		const char *name, const struct clk_hw *parent_hw,

		unsigned long flags, unsigned int mult, unsigned int div)

{

	return __clk_hw_register_fixed_factor(dev, NULL, name, NULL,

					      parent_hw, -1, flags, mult, div,

					      false);

}

EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor_parent_hw);



struct clk_hw *clk_hw_register_fixed_factor(struct device *dev,

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

		unsigned int mult, unsigned int div)

{

	return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, -1,

	return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, NULL, -1,

					      flags, mult, div, false);

}

EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor);
@@ -204,7 +239,7 @@ struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev, 
		const char *name, const char *parent_name, unsigned long flags,

		unsigned int mult, unsigned int div)

{

	return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, -1,

	return __clk_hw_register_fixed_factor(dev, NULL, name, parent_name, NULL, -1,

			flags, mult, div, true);

}

EXPORT_SYMBOL_GPL(devm_clk_hw_register_fixed_factor);
@@ -231,7 +266,7 @@ static struct clk_hw *_of_fixed_factor_clk_setup(struct device_node *node) 


	of_property_read_string(node, "clock-output-names", &clk_name);



	hw = __clk_hw_register_fixed_factor(NULL, node, clk_name, NULL, 0,

	hw = __clk_hw_register_fixed_factor(NULL, node, clk_name, NULL, NULL, 0,

					    0, mult, div, false);

	if (IS_ERR(hw)) {

		/*

include/linux/clk-provider.h

+8 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,14 @@ struct clk_hw *devm_clk_hw_register_fixed_factor(struct device *dev, 
struct clk_hw *devm_clk_hw_register_fixed_factor_index(struct device *dev,

		const char *name, unsigned int index, unsigned long flags,

		unsigned int mult, unsigned int div);



struct clk_hw *devm_clk_hw_register_fixed_factor_parent_hw(struct device *dev,

		const char *name, const struct clk_hw *parent_hw,

		unsigned long flags, unsigned int mult, unsigned int div);



struct clk_hw *clk_hw_register_fixed_factor_parent_hw(struct device *dev,

		const char *name, const struct clk_hw *parent_hw,

		unsigned long flags, unsigned int mult, unsigned int div);

/**

 * struct clk_fractional_divider - adjustable fractional divider clock

 *