Commit 1ff435d3 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-st-critical' into clk-next 

* clk-st-critical:
  clk: st: clkgen-pll: Detect critical clocks
  clk: st: clkgen-fsyn: Detect critical clocks
  clk: st: clk-flexgen: Detect critical clocks
parents a31bb032 6ca59e6e

drivers/clk/st/clk-flexgen.c

+3 −1
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static void __init st_of_flexgen_setup(struct device_node *np) 
	const char **parents;

	int num_parents, i;

	spinlock_t *rlock = NULL;

	unsigned long flex_flags = 0;

	int ret;



	pnode = of_get_parent(np);
@@ -308,12 +307,15 @@ static void __init st_of_flexgen_setup(struct device_node *np) 
	for (i = 0; i < clk_data->clk_num; i++) {

		struct clk *clk;

		const char *clk_name;

		unsigned long flex_flags = 0;



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

						  i, &clk_name)) {

			break;

		}



		of_clk_detect_critical(np, i, &flex_flags);



		/*

		 * If we read an empty clock name then the output is unused

		 */

drivers/clk/st/clkgen-fsyn.c

+7 −3
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ static const struct clk_ops st_quadfs_ops = { 
static struct clk * __init st_clk_register_quadfs_fsynth(

		const char *name, const char *parent_name,

		struct clkgen_quadfs_data *quadfs, void __iomem *reg, u32 chan,

		spinlock_t *lock)

		unsigned long flags, spinlock_t *lock)

{

	struct st_clk_quadfs_fsynth *fs;

	struct clk *clk;
@@ -1045,7 +1045,7 @@ static struct clk * __init st_clk_register_quadfs_fsynth( 


	init.name = name;

	init.ops = &st_quadfs_ops;

	init.flags = CLK_GET_RATE_NOCACHE | CLK_IS_BASIC;

	init.flags = flags | CLK_GET_RATE_NOCACHE | CLK_IS_BASIC;

	init.parent_names = &parent_name;

	init.num_parents = 1;
@@ -1115,6 +1115,7 @@ static void __init st_of_create_quadfs_fsynths( 
	for (fschan = 0; fschan < QUADFS_MAX_CHAN; fschan++) {

		struct clk *clk;

		const char *clk_name;

		unsigned long flags = 0;



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

						  fschan, &clk_name)) {
@@ -1127,8 +1128,11 @@ static void __init st_of_create_quadfs_fsynths( 
		if (*clk_name == '\0')

			continue;



		of_clk_detect_critical(np, fschan, &flags);



		clk = st_clk_register_quadfs_fsynth(clk_name, pll_name,

				quadfs, reg, fschan, lock);

						    quadfs, reg, fschan,

						    flags, lock);



		/*

		 * If there was an error registering this clock output, clean

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);