Commit ecbf3f17 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

clk: fixed-factor: Let clk framework find parent 



Convert this driver to a more modern way of specifying parents now that
we have a way to specify clk parents by DT index. This lets us nicely
avoid a problem where a parent clk name isn't know because the parent
clk hasn't been registered yet.

Cc: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Jeffrey Hugo <jhugo@codeaurora.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Tested-by: default avatarJeffrey Hugo <jhugo@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 601b6e93

drivers/clk/clk-fixed-factor.c

+33 −20
Original line number Diff line number Diff line
@@ -64,12 +64,14 @@ const struct clk_ops clk_fixed_factor_ops = { 
};

EXPORT_SYMBOL_GPL(clk_fixed_factor_ops);



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)

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,

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

{

	struct clk_fixed_factor *fix;

	struct clk_init_data init;

	struct clk_parent_data pdata = { .index = index };

	struct clk_hw *hw;

	int ret;
@@ -85,11 +87,17 @@ struct clk_hw *clk_hw_register_fixed_factor(struct device *dev, 
	init.name = name;

	init.ops = &clk_fixed_factor_ops;

	init.flags = flags | CLK_IS_BASIC;

	if (parent_name)

		init.parent_names = &parent_name;

	else

		init.parent_data = &pdata;

	init.num_parents = 1;



	hw = &fix->hw;

	if (dev)

		ret = clk_hw_register(dev, hw);

	else

		ret = of_clk_hw_register(np, hw);

	if (ret) {

		kfree(fix);

		hw = ERR_PTR(ret);
@@ -97,6 +105,14 @@ struct clk_hw *clk_hw_register_fixed_factor(struct device *dev, 


	return 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,

					      flags, mult, div);

}

EXPORT_SYMBOL_GPL(clk_hw_register_fixed_factor);



struct clk *clk_register_fixed_factor(struct device *dev, const char *name,
@@ -143,11 +159,10 @@ static const struct of_device_id set_rate_parent_matches[] = { 
	{ /* Sentinel */ },

};



static struct clk *_of_fixed_factor_clk_setup(struct device_node *node)

static struct clk_hw *_of_fixed_factor_clk_setup(struct device_node *node)

{

	struct clk *clk;

	struct clk_hw *hw;

	const char *clk_name = node->name;

	const char *parent_name;

	unsigned long flags = 0;

	u32 div, mult;

	int ret;
@@ -165,30 +180,28 @@ static struct clk *_of_fixed_factor_clk_setup(struct device_node *node) 
	}



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

	parent_name = of_clk_get_parent_name(node, 0);



	if (of_match_node(set_rate_parent_matches, node))

		flags |= CLK_SET_RATE_PARENT;



	clk = clk_register_fixed_factor(NULL, clk_name, parent_name, flags,

					mult, div);

	if (IS_ERR(clk)) {

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

					    flags, mult, div);

	if (IS_ERR(hw)) {

		/*

		 * If parent clock is not registered, registration would fail.

		 * Clear OF_POPULATED flag so that clock registration can be

		 * attempted again from probe function.

		 */

		of_node_clear_flag(node, OF_POPULATED);

		return clk;

		return ERR_CAST(hw);

	}



	ret = of_clk_add_provider(node, of_clk_src_simple_get, clk);

	ret = of_clk_add_hw_provider(node, of_clk_hw_simple_get, hw);

	if (ret) {

		clk_unregister(clk);

		clk_hw_unregister_fixed_factor(hw);

		return ERR_PTR(ret);

	}



	return clk;

	return hw;

}



/**
@@ -203,17 +216,17 @@ CLK_OF_DECLARE(fixed_factor_clk, "fixed-factor-clock", 


static int of_fixed_factor_clk_remove(struct platform_device *pdev)

{

	struct clk *clk = platform_get_drvdata(pdev);

	struct clk_hw *clk = platform_get_drvdata(pdev);



	of_clk_del_provider(pdev->dev.of_node);

	clk_unregister_fixed_factor(clk);

	clk_hw_unregister_fixed_factor(clk);



	return 0;

}



static int of_fixed_factor_clk_probe(struct platform_device *pdev)

{

	struct clk *clk;

	struct clk_hw *clk;



	/*

	 * This function is not executed when of_fixed_factor_clk_setup

CRA Git | Maintained and supported by SUSTech CRA and CCSE