Commit ed06099c authored by Tony Lindgren's avatar Tony Lindgren Committed by Stephen Boyd
Browse files

clk: ti: Update component clocks to use ti_dt_clk_name() 



Let's update all the TI component clocks to use ti_dt_clk_name() instead
of devicetree node name if available.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20220204071449.16762-9-tony@atomide.com


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 9e56a7d4

drivers/clk/ti/autoidle.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ int __init of_ti_clk_autoidle_setup(struct device_node *node) 
		return -ENOMEM;



	clk->shift = shift;

	clk->name = node->name;

	clk->name = ti_dt_clk_name(node);

	ret = ti_clk_get_reg_addr(node, 0, &clk->reg);

	if (ret) {

		kfree(clk);

drivers/clk/ti/clk-dra7-atl.c

+4 −2
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node) 
	struct dra7_atl_desc *clk_hw = NULL;

	struct clk_init_data init = { NULL };

	const char **parent_names = NULL;

	const char *name;

	struct clk *clk;



	clk_hw = kzalloc(sizeof(*clk_hw), GFP_KERNEL);
@@ -183,7 +184,8 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node) 


	clk_hw->hw.init = &init;

	clk_hw->divider = 1;

	init.name = node->name;

	name = ti_dt_clk_name(node);

	init.name = name;

	init.ops = &atl_clk_ops;

	init.flags = CLK_IGNORE_UNUSED;

	init.num_parents = of_clk_get_parent_count(node);
@@ -203,7 +205,7 @@ static void __init of_dra7_atl_clock_setup(struct device_node *node) 


	init.parent_names = parent_names;



	clk = ti_clk_register(NULL, &clk_hw->hw, node->name);

	clk = ti_clk_register(NULL, &clk_hw->hw, name);



	if (!IS_ERR(clk)) {

		of_clk_add_provider(node, of_clk_src_simple_get, clk);

drivers/clk/ti/composite.c

+4 −2
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ static void __init _register_composite(void *user, 
	struct component_clk *comp;

	int num_parents = 0;

	const char **parent_names = NULL;

	const char *name;

	int i;

	int ret;
@@ -172,7 +173,8 @@ static void __init _register_composite(void *user, 
		goto cleanup;

	}



	clk = clk_register_composite(NULL, node->name,

	name = ti_dt_clk_name(node);

	clk = clk_register_composite(NULL, name,

				     parent_names, num_parents,

				     _get_hw(cclk, CLK_COMPONENT_TYPE_MUX),

				     &ti_clk_mux_ops,
@@ -182,7 +184,7 @@ static void __init _register_composite(void *user, 
				     &ti_composite_gate_ops, 0);



	if (!IS_ERR(clk)) {

		ret = ti_clk_add_alias(NULL, clk, node->name);

		ret = ti_clk_add_alias(NULL, clk, name);

		if (ret) {

			clk_unregister(clk);

			goto cleanup;

drivers/clk/ti/divider.c

+4 −2
Original line number Diff line number Diff line
@@ -320,10 +320,12 @@ static struct clk *_register_divider(struct device_node *node, 
	struct clk *clk;

	struct clk_init_data init;

	const char *parent_name;

	const char *name;



	parent_name = of_clk_get_parent_name(node, 0);



	init.name = node->name;

	name = ti_dt_clk_name(node);

	init.name = name;

	init.ops = &ti_clk_divider_ops;

	init.flags = flags;

	init.parent_names = (parent_name ? &parent_name : NULL);
@@ -332,7 +334,7 @@ static struct clk *_register_divider(struct device_node *node, 
	div->hw.init = &init;



	/* register the clock */

	clk = ti_clk_register(NULL, &div->hw, node->name);

	clk = ti_clk_register(NULL, &div->hw, name);



	if (IS_ERR(clk))

		kfree(div);

drivers/clk/ti/fixed-factor.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
static void __init of_ti_fixed_factor_clk_setup(struct device_node *node)

{

	struct clk *clk;

	const char *clk_name = node->name;

	const char *clk_name = ti_dt_clk_name(node);

	const char *parent_name;

	u32 div, mult;

	u32 flags = 0;