Commit 49cb392d authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: composite: Add hw based registration APIs 



Add registration APIs in the clk composite code to return struct
clk_hw pointers instead of struct clk pointers. This way we hide
the struct clk pointer from providers unless they need to use
consumer facing APIs.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 39b44cff

drivers/clk/clk-composite.c

+33 −12
Original line number Original line Diff line number Diff line
@@ -184,17 +184,18 @@ static void clk_composite_disable(struct clk_hw *hw) 
	gate_ops->disable(gate_hw);

	gate_ops->disable(gate_hw);

}

}





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

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

			const char * const *parent_names, int num_parents,

			const char * const *parent_names, int num_parents,

			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,

			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,

			struct clk_hw *rate_hw, const struct clk_ops *rate_ops,

			struct clk_hw *rate_hw, const struct clk_ops *rate_ops,

			struct clk_hw *gate_hw, const struct clk_ops *gate_ops,

			struct clk_hw *gate_hw, const struct clk_ops *gate_ops,

			unsigned long flags)

			unsigned long flags)

{

{

	struct clk *clk;

	struct clk_hw *hw;

	struct clk_init_data init;

	struct clk_init_data init;

	struct clk_composite *composite;

	struct clk_composite *composite;

	struct clk_ops *clk_composite_ops;

	struct clk_ops *clk_composite_ops;

	int ret;





	composite = kzalloc(sizeof(*composite), GFP_KERNEL);

	composite = kzalloc(sizeof(*composite), GFP_KERNEL);

	if (!composite)

	if (!composite)
@@ -204,12 +205,13 @@ struct clk *clk_register_composite(struct device *dev, const char *name, 
	init.flags = flags | CLK_IS_BASIC;

	init.flags = flags | CLK_IS_BASIC;

	init.parent_names = parent_names;

	init.parent_names = parent_names;

	init.num_parents = num_parents;

	init.num_parents = num_parents;

	hw = &composite->hw;





	clk_composite_ops = &composite->ops;

	clk_composite_ops = &composite->ops;





	if (mux_hw && mux_ops) {

	if (mux_hw && mux_ops) {

		if (!mux_ops->get_parent) {

		if (!mux_ops->get_parent) {

			clk = ERR_PTR(-EINVAL);

			hw = ERR_PTR(-EINVAL);

			goto err;

			goto err;

		}

		}
@@ -224,7 +226,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name, 




	if (rate_hw && rate_ops) {

	if (rate_hw && rate_ops) {

		if (!rate_ops->recalc_rate) {

		if (!rate_ops->recalc_rate) {

			clk = ERR_PTR(-EINVAL);

			hw = ERR_PTR(-EINVAL);

			goto err;

			goto err;

		}

		}

		clk_composite_ops->recalc_rate = clk_composite_recalc_rate;

		clk_composite_ops->recalc_rate = clk_composite_recalc_rate;
@@ -253,7 +255,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name, 
	if (gate_hw && gate_ops) {

	if (gate_hw && gate_ops) {

		if (!gate_ops->is_enabled || !gate_ops->enable ||

		if (!gate_ops->is_enabled || !gate_ops->enable ||

		    !gate_ops->disable) {

		    !gate_ops->disable) {

			clk = ERR_PTR(-EINVAL);

			hw = ERR_PTR(-EINVAL);

			goto err;

			goto err;

		}

		}
@@ -267,22 +269,41 @@ struct clk *clk_register_composite(struct device *dev, const char *name, 
	init.ops = clk_composite_ops;

	init.ops = clk_composite_ops;

	composite->hw.init = &init;

	composite->hw.init = &init;





	clk = clk_register(dev, &composite->hw);

	ret = clk_hw_register(dev, hw);

	if (IS_ERR(clk))

	if (ret) {

		hw = ERR_PTR(ret);

		goto err;

		goto err;

	}





	if (composite->mux_hw)

	if (composite->mux_hw)

		composite->mux_hw->clk = clk;

		composite->mux_hw->clk = hw->clk;





	if (composite->rate_hw)

	if (composite->rate_hw)

		composite->rate_hw->clk = clk;

		composite->rate_hw->clk = hw->clk;





	if (composite->gate_hw)

	if (composite->gate_hw)

		composite->gate_hw->clk = clk;

		composite->gate_hw->clk = hw->clk;





	return clk;

	return hw;





err:

err:

	kfree(composite);

	kfree(composite);

	return clk;

	return hw;

}



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

			const char * const *parent_names, int num_parents,

			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,

			struct clk_hw *rate_hw, const struct clk_ops *rate_ops,

			struct clk_hw *gate_hw, const struct clk_ops *gate_ops,

			unsigned long flags)

{

	struct clk_hw *hw;



	hw = clk_hw_register_composite(dev, name, parent_names, num_parents,

			mux_hw, mux_ops, rate_hw, rate_ops, gate_hw, gate_ops,

			flags);

	if (IS_ERR(hw))

		return ERR_CAST(hw);

	return hw->clk;

}
 
}

include/linux/clk-provider.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -638,6 +638,13 @@ struct clk *clk_register_composite(struct device *dev, const char *name, 
		struct clk_hw *rate_hw, const struct clk_ops *rate_ops,

		struct clk_hw *rate_hw, const struct clk_ops *rate_ops,

		struct clk_hw *gate_hw, const struct clk_ops *gate_ops,

		struct clk_hw *gate_hw, const struct clk_ops *gate_ops,

		unsigned long flags);

		unsigned long flags);

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

		const char * const *parent_names, int num_parents,

		struct clk_hw *mux_hw, const struct clk_ops *mux_ops,

		struct clk_hw *rate_hw, const struct clk_ops *rate_ops,

		struct clk_hw *gate_hw, const struct clk_ops *gate_ops,

		unsigned long flags);

void clk_hw_unregister_composite(struct clk_hw *hw);





/***

/***

 * struct clk_gpio_gate - gpio gated clock

 * struct clk_gpio_gate - gpio gated clock

CRA Git | Maintained and supported by SUSTech CRA and CCSE