Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca59e6e authored by Lee Jones's avatar Lee Jones Committed by Stephen Boyd
Browse files

clk: st: clkgen-pll: Detect critical clocks 



Utilise the new Critical Clock infrastructure to mark clocks which
much not be disabled as CRITICAL.

Clocks are marked as CRITICAL using clk flags.  This patch also
ensures flags are peculated through the framework in the correct
manner.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent a3a2d78b

drivers/clk/st/clkgen-pll.c

+17 −10
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static const struct clk_ops stm_pll4600c28_ops = { 


static struct clk * __init clkgen_pll_register(const char *parent_name,

				struct clkgen_pll_data	*pll_data,

				void __iomem *reg,

				void __iomem *reg, unsigned long pll_flags,

				const char *clk_name, spinlock_t *lock)

{

	struct clkgen_pll *pll;
@@ -854,7 +854,7 @@ static struct clk * __init clkgen_pll_register(const char *parent_name, 
	init.name = clk_name;

	init.ops = pll_data->ops;



	init.flags = CLK_IS_BASIC | CLK_GET_RATE_NOCACHE;

	init.flags = pll_flags | CLK_IS_BASIC | CLK_GET_RATE_NOCACHE;

	init.parent_names = &parent_name;

	init.num_parents  = 1;
@@ -948,7 +948,7 @@ static void __init clkgena_c65_pll_setup(struct device_node *np) 
	 */

	clk_data->clks[0] = clkgen_pll_register(parent_name,

			(struct clkgen_pll_data *) &st_pll1600c65_ax,

			reg + CLKGENAx_PLL0_OFFSET, clk_name, NULL);

			reg + CLKGENAx_PLL0_OFFSET, 0, clk_name, NULL);



	if (IS_ERR(clk_data->clks[0]))

		goto err;
@@ -977,7 +977,7 @@ static void __init clkgena_c65_pll_setup(struct device_node *np) 
	 */

	clk_data->clks[2] = clkgen_pll_register(parent_name,

			(struct clkgen_pll_data *) &st_pll800c65_ax,

			reg + CLKGENAx_PLL1_OFFSET, clk_name, NULL);

			reg + CLKGENAx_PLL1_OFFSET, 0, clk_name, NULL);



	if (IS_ERR(clk_data->clks[2]))

		goto err;
@@ -995,7 +995,7 @@ CLK_OF_DECLARE(clkgena_c65_plls, 
static struct clk * __init clkgen_odf_register(const char *parent_name,

					       void __iomem *reg,

					       struct clkgen_pll_data *pll_data,

					       int odf,

					       unsigned long pll_flags, int odf,

					       spinlock_t *odf_lock,

					       const char *odf_name)

{
@@ -1004,7 +1004,7 @@ static struct clk * __init clkgen_odf_register(const char *parent_name, 
	struct clk_gate *gate;

	struct clk_divider *div;



	flags = CLK_GET_RATE_NOCACHE | CLK_SET_RATE_PARENT;

	flags = pll_flags | CLK_GET_RATE_NOCACHE | CLK_SET_RATE_PARENT;



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

	if (!gate)
@@ -1099,6 +1099,7 @@ static void __init clkgen_c32_pll_setup(struct device_node *np) 
	int num_odfs, odf;

	struct clk_onecell_data *clk_data;

	struct clkgen_pll_data	*data;

	unsigned long pll_flags = 0;



	match = of_match_node(c32_pll_of_match, np);

	if (!match) {
@@ -1116,8 +1117,10 @@ static void __init clkgen_c32_pll_setup(struct device_node *np) 
	if (!pll_base)

		return;



	clk = clkgen_pll_register(parent_name, data, pll_base, np->name,

				  data->lock);

	of_clk_detect_critical(np, 0, &pll_flags);



	clk = clkgen_pll_register(parent_name, data, pll_base, pll_flags,

				  np->name, data->lock);

	if (IS_ERR(clk))

		return;
@@ -1139,12 +1142,15 @@ static void __init clkgen_c32_pll_setup(struct device_node *np) 
	for (odf = 0; odf < num_odfs; odf++) {

		struct clk *clk;

		const char *clk_name;

		unsigned long odf_flags = 0;



		if (of_property_read_string_index(np, "clock-output-names",

						  odf, &clk_name))

			return;



		clk = clkgen_odf_register(pll_name, pll_base, data,

		of_clk_detect_critical(np, odf, &odf_flags);



		clk = clkgen_odf_register(pll_name, pll_base, data, odf_flags,

				odf, &clkgena_c32_odf_lock, clk_name);

		if (IS_ERR(clk))

			goto err;
@@ -1206,7 +1212,8 @@ static void __init clkgengpu_c32_pll_setup(struct device_node *np) 
	/*

	 * PLL 1200MHz output

	 */

	clk = clkgen_pll_register(parent_name, data, reg, clk_name, data->lock);

	clk = clkgen_pll_register(parent_name, data, reg,

				  0, clk_name, data->lock);



	if (!IS_ERR(clk))

		of_clk_add_provider(np, of_clk_src_simple_get, clk);