[PATCH v3 1/4] clk: ti: fapll: remove ti_dt_clk_name helper

From: Ettore Chimenti

Date: Fri Nov 13 2026 - 16:31:40 EST


From: Rouven Czerwinski <rouven.czerwinski@xxxxxxxxxx>

The fapll driver uses multiple `clock-output-names`, so we cannot use the
DT helper in this driver because that would assign the first clock
output name as the parent name. Otherwise, the clock hierarchy would
look like this:

main_pll_clk1 <--- main PLL should be parent of other PLLs.
sysclk1_ck
main_pll_clk7
...
main_pll_clk6
...
main_pll_clk5
...
main_pll_clk4
...

Reverting to not using `ti_dt_clk_name()` solves this problem, assigning
the correct parent. This change do not affect other SoCs as the only
consumer is DM816x.

Fixes: 9e56a7d4263c ("clk: ti: Update pll and clockdomain clocks to use ti_dt_clk_name()")
Signed-off-by: Rouven Czerwinski <rouven.czerwinski@xxxxxxxxxx>
Tested-by: Andrew Goodbody <andrew.goodbody@xxxxxxxxxx>
Signed-off-by: Ettore Chimenti <ettore.chimenti@xxxxxxxxxx>
---
drivers/clk/ti/fapll.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/clk/ti/fapll.c b/drivers/clk/ti/fapll.c
index e54b1df3436e..ae2f6fed10f6 100644
--- a/drivers/clk/ti/fapll.c
+++ b/drivers/clk/ti/fapll.c
@@ -10,8 +10,6 @@
#include <linux/of_address.h>
#include <linux/clk/ti.h>

-#include "clock.h"
-
/* FAPLL Control Register PLL_CTRL */
#define FAPLL_MAIN_MULT_N_SHIFT 16
#define FAPLL_MAIN_DIV_P_SHIFT 8
@@ -541,7 +539,6 @@ static void __init ti_fapll_setup(struct device_node *node)
struct clk_init_data *init = NULL;
const char *parent_name[2];
struct clk *pll_clk;
- const char *name;
int i;

fd = kzalloc_obj(*fd);
@@ -559,8 +556,7 @@ static void __init ti_fapll_setup(struct device_node *node)
goto free;

init->ops = &ti_fapll_ops;
- name = ti_dt_clk_name(node);
- init->name = name;
+ init->name = node->name;

init->num_parents = of_clk_get_parent_count(node);
if (init->num_parents != 2) {
@@ -592,7 +588,7 @@ static void __init ti_fapll_setup(struct device_node *node)
if (fapll_is_ddr_pll(fd->base))
fd->bypass_bit_inverted = true;

- fd->name = name;
+ fd->name = node->name;
fd->hw.init = init;

/* Register the parent PLL */
@@ -639,7 +635,7 @@ static void __init ti_fapll_setup(struct device_node *node)
freq = NULL;
}
synth_clk = ti_fapll_synth_setup(fd, freq, div, output_instance,
- output_name, name, pll_clk);
+ output_name, node->name, pll_clk);
if (IS_ERR(synth_clk))
continue;


--
2.56.1