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

Merge branches 'clk-aspeed', 'clk-unused', 'clk-of-node-put',... 

Merge branches 'clk-aspeed', 'clk-unused', 'clk-of-node-put', 'clk-const-bulk-data' and 'clk-debugfs' into clk-next

 - Add SDIO gate to aspeed driver
 - Support aspeed AST2600 SoC
 - Add missing of_node_put() calls in various clk drivers
 - Drop NULL checks in clk debugfs
 - Add min/max rates to clk debugfs

* clk-aspeed:
  clk: Add support for AST2600 SoC
  clk: aspeed: Move structures to header
  clk: aspeed: Add SDIO gate

* clk-unused:
  clk: st: clkgen-pll: remove unused variable 'st_pll3200c32_407_a0'
  clk: st: clkgen-fsyn: remove unused variable 'st_quadfs_fs660c32_ops'
  clk: composite: Drop unused clk.h include
  clk: Si5341/Si5340: remove redundant assignment to n_den
  clk: qoriq: Fix -Wunused-const-variable

* clk-of-node-put:
  clk: ti: dm814x: Add of_node_put() to prevent memory leak
  clk: st: clk-flexgen: Add of_node_put() in st_of_flexgen_setup()
  clk: davinci: pll: Add of_node_put() in of_davinci_pll_init()
  clk: versatile: Add of_node_put() in cm_osc_setup()

* clk-const-bulk-data:
  clk: Constify struct clk_bulk_data * where possible

* clk-debugfs:
  clk: Drop !clk checks in debugfs dumping
  clk: Use seq_puts() in possible_parent_show()
  clk: Assert prepare_lock in clk_core_get_boundaries
  clk: Add clk_min/max_rate entries in debugfs
parents d3d04f6c 8863a5bf b684702f 570aaec7 7f480466

drivers/clk/clk-composite.c

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 * Copyright (c) 2013 NVIDIA CORPORATION.  All rights reserved.

 */



#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/err.h>

#include <linux/slab.h>

drivers/clk/clk-qoriq.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static const struct clockgen_chipinfo chipinfo[] = { 
		.guts_compat = "fsl,qoriq-device-config-1.0",

		.init_periph = p5020_init_periph,

		.cmux_groups = {

			&p2041_cmux_grp1, &p2041_cmux_grp2

			&p5020_cmux_grp1, &p5020_cmux_grp2

		},

		.cmux_to_group = {

			0, 1, -1

drivers/clk/clk-si5341.c

+0 −1
Original line number Diff line number Diff line
@@ -547,7 +547,6 @@ static int si5341_synth_clk_set_rate(struct clk_hw *hw, unsigned long rate, 
	bool is_integer;



	n_num = synth->data->freq_vco;

	n_den = rate;



	/* see if there's an integer solution */

	r = do_div(n_num, rate);

drivers/clk/clk.c

+42 −16
Original line number Diff line number Diff line
@@ -593,6 +593,8 @@ static void clk_core_get_boundaries(struct clk_core *core, 
{

	struct clk *clk_user;



	lockdep_assert_held(&prepare_lock);



	*min_rate = core->min_rate;

	*max_rate = core->max_rate;
@@ -2847,9 +2849,6 @@ static struct hlist_head *orphan_list[] = { 
static void clk_summary_show_one(struct seq_file *s, struct clk_core *c,

				 int level)

{

	if (!c)

		return;



	seq_printf(s, "%*s%-*s %7d %8d %8d %11lu %10lu %5d %6d\n",

		   level * 3 + 1, "",

		   30 - level * 3, c->name,
@@ -2864,9 +2863,6 @@ static void clk_summary_show_subtree(struct seq_file *s, struct clk_core *c, 
{

	struct clk_core *child;



	if (!c)

		return;



	clk_summary_show_one(s, c, level);



	hlist_for_each_entry(child, &c->children, child_node)
@@ -2896,8 +2892,9 @@ DEFINE_SHOW_ATTRIBUTE(clk_summary); 


static void clk_dump_one(struct seq_file *s, struct clk_core *c, int level)

{

	if (!c)

		return;

	unsigned long min_rate, max_rate;



	clk_core_get_boundaries(c, &min_rate, &max_rate);



	/* This should be JSON format, i.e. elements separated with a comma */

	seq_printf(s, "\"%s\": { ", c->name);
@@ -2905,6 +2902,8 @@ static void clk_dump_one(struct seq_file *s, struct clk_core *c, int level) 
	seq_printf(s, "\"prepare_count\": %d,", c->prepare_count);

	seq_printf(s, "\"protect_count\": %d,", c->protect_count);

	seq_printf(s, "\"rate\": %lu,", clk_core_get_rate(c));

	seq_printf(s, "\"min_rate\": %lu,", min_rate);

	seq_printf(s, "\"max_rate\": %lu,", max_rate);

	seq_printf(s, "\"accuracy\": %lu,", clk_core_get_accuracy(c));

	seq_printf(s, "\"phase\": %d,", clk_core_get_phase(c));

	seq_printf(s, "\"duty_cycle\": %u",
@@ -2915,9 +2914,6 @@ static void clk_dump_subtree(struct seq_file *s, struct clk_core *c, int level) 
{

	struct clk_core *child;



	if (!c)

		return;



	clk_dump_one(s, c, level);



	hlist_for_each_entry(child, &c->children, child_node) {
@@ -3013,13 +3009,13 @@ static void possible_parent_show(struct seq_file *s, struct clk_core *core, 
	 */

	parent = clk_core_get_parent_by_index(core, i);

	if (parent)

		seq_printf(s, "%s", parent->name);

		seq_puts(s, parent->name);

	else if (core->parents[i].name)

		seq_printf(s, "%s", core->parents[i].name);

		seq_puts(s, core->parents[i].name);

	else if (core->parents[i].fw_name)

		seq_printf(s, "<%s>(fw)", core->parents[i].fw_name);

	else if (core->parents[i].index >= 0)

		seq_printf(s, "%s",

		seq_puts(s,

			 of_clk_get_parent_name(core->of_node,

						core->parents[i].index));

	else
@@ -3064,6 +3060,34 @@ static int clk_duty_cycle_show(struct seq_file *s, void *data) 
}

DEFINE_SHOW_ATTRIBUTE(clk_duty_cycle);



static int clk_min_rate_show(struct seq_file *s, void *data)

{

	struct clk_core *core = s->private;

	unsigned long min_rate, max_rate;



	clk_prepare_lock();

	clk_core_get_boundaries(core, &min_rate, &max_rate);

	clk_prepare_unlock();

	seq_printf(s, "%lu\n", min_rate);



	return 0;

}

DEFINE_SHOW_ATTRIBUTE(clk_min_rate);



static int clk_max_rate_show(struct seq_file *s, void *data)

{

	struct clk_core *core = s->private;

	unsigned long min_rate, max_rate;



	clk_prepare_lock();

	clk_core_get_boundaries(core, &min_rate, &max_rate);

	clk_prepare_unlock();

	seq_printf(s, "%lu\n", max_rate);



	return 0;

}

DEFINE_SHOW_ATTRIBUTE(clk_max_rate);



static void clk_debug_create_one(struct clk_core *core, struct dentry *pdentry)

{

	struct dentry *root;
@@ -3075,6 +3099,8 @@ static void clk_debug_create_one(struct clk_core *core, struct dentry *pdentry) 
	core->dentry = root;



	debugfs_create_ulong("clk_rate", 0444, root, &core->rate);

	debugfs_create_file("clk_min_rate", 0444, root, core, &clk_min_rate_fops);

	debugfs_create_file("clk_max_rate", 0444, root, core, &clk_max_rate_fops);

	debugfs_create_ulong("clk_accuracy", 0444, root, &core->accuracy);

	debugfs_create_u32("clk_phase", 0444, root, &core->phase);

	debugfs_create_file("clk_flags", 0444, root, core, &clk_flags_fops);

drivers/clk/davinci/pll.c

+4 −1
Original line number Diff line number Diff line
@@ -778,12 +778,15 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node, 
		int i;



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

		if (!clk_data)

		if (!clk_data) {

			of_node_put(child);

			return -ENOMEM;

		}



		clks = kmalloc_array(n_clks, sizeof(*clks), GFP_KERNEL);

		if (!clks) {

			kfree(clk_data);

			of_node_put(child);

			return -ENOMEM;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE