summaryrefslogtreecommitdiffstats
path: root/drivers/clk/ti/composite.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2022-02-04 09:14:49 +0200
committerStephen Boyd <sboyd@kernel.org>2022-03-10 18:55:59 -0800
commited06099c5d0b329082cc19c58eace0b20bf7fe70 (patch)
treecdc90f4803d522ffb1f2220a5d2254824c2727e5 /drivers/clk/ti/composite.c
parent9e56a7d4263ca1c51d867e811cf2dd7e61b6469e (diff)
downloadlinux-stable-ed06099c5d0b329082cc19c58eace0b20bf7fe70.tar.gz
linux-stable-ed06099c5d0b329082cc19c58eace0b20bf7fe70.tar.bz2
linux-stable-ed06099c5d0b329082cc19c58eace0b20bf7fe70.zip
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: Tony Lindgren <tony@atomide.com> Link: https://lore.kernel.org/r/20220204071449.16762-9-tony@atomide.com Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers/clk/ti/composite.c')
-rw-r--r--drivers/clk/ti/composite.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/clk/ti/composite.c b/drivers/clk/ti/composite.c
index eaa43575cfa5..8d60319be368 100644
--- a/drivers/clk/ti/composite.c
+++ b/drivers/clk/ti/composite.c
@@ -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;