From: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Switch old dt-compat clocks to use parent_hw and parent_data. Having
parent_hw instead of parent names improves to clock registration
speed and re-parenting.
Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
---
drivers/clk/at91/dt-compat.c | 80 +++++++++++++++++++++++++-----------
1 file changed, 56 insertions(+), 24 deletions(-)
diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
index fa8658d3be7b..9ca871b817e0 100644
--- a/drivers/clk/at91/dt-compat.c
+++ b/drivers/clk/at91/dt-compat.c
@@ -43,7 +43,8 @@ static void __init of_sama5d2_clk_audio_pll_frac_setup(struct device_node *np)
parent_name = of_clk_get_parent_name(np, 0);
- hw = at91_clk_register_audio_pll_frac(regmap, name, parent_name, NULL);
+ hw = at91_clk_register_audio_pll_frac(regmap, name, NULL,
+ &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
@@ -69,7 +70,8 @@ static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np)
parent_name = of_clk_get_parent_name(np, 0);
- hw = at91_clk_register_audio_pll_pad(regmap, name, parent_name, NULL);
+ hw = at91_clk_register_audio_pll_pad(regmap, name, NULL,
+ &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
@@ -95,7 +97,7 @@ static void __init of_sama5d2_clk_audio_pll_pmc_setup(struct device_node *np)
parent_name = of_clk_get_parent_name(np, 0);
- hw = at91_clk_register_audio_pll_pmc(regmap, name, parent_name, NULL);
+ hw = at91_clk_register_audio_pll_pmc(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
@@ -129,6 +131,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
struct clk_hw *hw;
unsigned int num_parents;
const char *parent_names[GENERATED_SOURCE_MAX];
+ struct clk_parent_data parent_data[GENERATED_SOURCE_MAX];
struct device_node *gcknp, *parent_np;
struct clk_range range = CLK_RANGE(0, 0);
struct regmap *regmap;
@@ -149,6 +152,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
if (IS_ERR(regmap))
return;
+ for (unsigned int i = 0; i < num_parents; i++)
+ parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
for_each_child_of_node(np, gcknp) {
int chg_pid = INT_MIN;
@@ -171,7 +176,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
&dt_pcr_layout, name,
- parent_names, NULL, NULL,
+ NULL, parent_data, NULL,
num_parents, id, &range,
chg_pid);
if (IS_ERR(hw))
@@ -201,7 +206,7 @@ static void __init of_sama5d4_clk_h32mx_setup(struct device_node *np)
parent_name = of_clk_get_parent_name(np, 0);
- hw = at91_clk_register_h32mx(regmap, name, parent_name, NULL);
+ hw = at91_clk_register_h32mx(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
@@ -228,6 +233,8 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
return;
for_each_child_of_node(np, i2s_mux_np) {
+ struct clk_parent_data parent_data[2];
+
if (of_property_read_u8(i2s_mux_np, "reg", &bus_id))
continue;
@@ -238,8 +245,10 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
if (ret != 2)
continue;
+ parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
+ parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
hw = at91_clk_i2s_mux_register(regmap_sfr, i2s_mux_np->name,
- parent_names, NULL, 2, bus_id);
+ NULL, parent_data, 2, bus_id);
if (IS_ERR(hw))
continue;
@@ -269,7 +278,8 @@ static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np)
if (IS_ERR(regmap))
return;
- hw = at91_clk_register_main_osc(regmap, name, parent_name, NULL, bypass);
+ hw = at91_clk_register_main_osc(regmap, name, NULL,
+ &AT91_CLK_PD_NAME(parent_name), bypass);
if (IS_ERR(hw))
return;
@@ -323,7 +333,7 @@ static void __init of_at91rm9200_clk_main_setup(struct device_node *np)
if (IS_ERR(regmap))
return;
- hw = at91_clk_register_rm9200_main(regmap, name, parent_name, NULL);
+ hw = at91_clk_register_rm9200_main(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
@@ -336,6 +346,7 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
{
struct clk_hw *hw;
const char *parent_names[2];
+ struct clk_parent_data parent_data[2];
unsigned int num_parents;
const char *name = np->name;
struct regmap *regmap;
@@ -354,7 +365,9 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
of_property_read_string(np, "clock-output-names", &name);
- hw = at91_clk_register_sam9x5_main(regmap, name, parent_names, NULL,
+ parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
+ parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
+ hw = at91_clk_register_sam9x5_main(regmap, name, NULL, parent_data,
num_parents);
if (IS_ERR(hw))
return;
@@ -396,6 +409,7 @@ of_at91_clk_master_setup(struct device_node *np,
struct clk_hw *hw;
unsigned int num_parents;
const char *parent_names[MASTER_SOURCE_MAX];
+ struct clk_parent_data parent_data[MASTER_SOURCE_MAX];
const char *name = np->name;
struct clk_master_characteristics *characteristics;
struct regmap *regmap;
@@ -419,13 +433,15 @@ of_at91_clk_master_setup(struct device_node *np,
if (IS_ERR(regmap))
return;
+ for (unsigned int i = 0; i < MASTER_SOURCE_MAX; i++)
+ parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
hw = at91_clk_register_master_pres(regmap, "masterck_pres", num_parents,
- parent_names, NULL, layout,
+ NULL, parent_data, layout,
characteristics, &mck_lock);
if (IS_ERR(hw))
goto out_free_characteristics;
- hw = at91_clk_register_master_div(regmap, name, "masterck_pres", NULL,
+ hw = at91_clk_register_master_div(regmap, name, NULL, &AT91_CLK_PD_HW(hw),
layout, characteristics,
&mck_lock, CLK_SET_RATE_GATE, 0);
if (IS_ERR(hw))
@@ -489,8 +505,8 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type)
name = periphclknp->name;
if (type == PERIPHERAL_AT91RM9200) {
- hw = at91_clk_register_peripheral(regmap, name,
- parent_name, NULL, id);
+ hw = at91_clk_register_peripheral(regmap, name, NULL,
+ &AT91_CLK_PD_NAME(parent_name), id);
} else {
struct clk_range range = CLK_RANGE(0, 0);
unsigned long flags = 0;
@@ -511,8 +527,8 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type)
&pmc_pcr_lock,
&dt_pcr_layout,
name,
- parent_name,
NULL,
+ &AT91_CLK_PD_NAME(parent_name),
id, &range,
INT_MIN,
flags);
@@ -665,7 +681,8 @@ of_at91_clk_pll_setup(struct device_node *np,
if (!characteristics)
return;
- hw = at91_clk_register_pll(regmap, name, parent_name, NULL, id, layout,
+ hw = at91_clk_register_pll(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name),
+ id, layout,
characteristics);
if (IS_ERR(hw))
goto out_free_characteristics;
@@ -724,7 +741,7 @@ of_at91sam9x5_clk_plldiv_setup(struct device_node *np)
if (IS_ERR(regmap))
return;
- hw = at91_clk_register_plldiv(regmap, name, parent_name, NULL);
+ hw = at91_clk_register_plldiv(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
@@ -743,6 +760,7 @@ of_at91_clk_prog_setup(struct device_node *np,
struct clk_hw *hw;
unsigned int num_parents;
const char *parent_names[PROG_SOURCE_MAX];
+ struct clk_parent_data parent_data[PROG_SOURCE_MAX];
const char *name;
struct device_node *progclknp, *parent_np;
struct regmap *regmap;
@@ -763,6 +781,8 @@ of_at91_clk_prog_setup(struct device_node *np,
if (IS_ERR(regmap))
return;
+ for (unsigned int i = 0; i < PROG_SOURCE_MAX; i++)
+ parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
for_each_child_of_node(np, progclknp) {
if (of_property_read_u32(progclknp, "reg", &id))
continue;
@@ -771,7 +791,7 @@ of_at91_clk_prog_setup(struct device_node *np,
name = progclknp->name;
hw = at91_clk_register_programmable(regmap, name,
- parent_names, NULL, num_parents,
+ NULL, parent_data, num_parents,
id, layout, mux_table);
if (IS_ERR(hw))
continue;
@@ -805,6 +825,7 @@ static void __init of_at91sam9260_clk_slow_setup(struct device_node *np)
{
struct clk_hw *hw;
const char *parent_names[2];
+ struct clk_parent_data parent_data[2];
unsigned int num_parents;
const char *name = np->name;
struct regmap *regmap;
@@ -823,7 +844,9 @@ static void __init of_at91sam9260_clk_slow_setup(struct device_node *np)
of_property_read_string(np, "clock-output-names", &name);
- hw = at91_clk_register_sam9260_slow(regmap, name, parent_names, NULL,
+ parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
+ parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
+ hw = at91_clk_register_sam9260_slow(regmap, name, NULL, parent_data,
num_parents);
if (IS_ERR(hw))
return;
@@ -841,6 +864,7 @@ static void __init of_at91sam9x5_clk_smd_setup(struct device_node *np)
struct clk_hw *hw;
unsigned int num_parents;
const char *parent_names[SMD_SOURCE_MAX];
+ struct clk_parent_data parent_data[SMD_SOURCE_MAX];
const char *name = np->name;
struct regmap *regmap;
struct device_node *parent_np;
@@ -859,7 +883,9 @@ static void __init of_at91sam9x5_clk_smd_setup(struct device_node *np)
if (IS_ERR(regmap))
return;
- hw = at91sam9x5_clk_register_smd(regmap, name, parent_names, NULL,
+ for (unsigned int i = 0; i < SMD_SOURCE_MAX; i++)
+ parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
+ hw = at91sam9x5_clk_register_smd(regmap, name, NULL, parent_data,
num_parents);
if (IS_ERR(hw))
return;
@@ -909,7 +935,8 @@ static void __init of_at91rm9200_clk_sys_setup(struct device_node *np)
if (!strcmp(sysclknp->name, "ddrck"))
flags = CLK_IS_CRITICAL;
- hw = at91_clk_register_system(regmap, name, parent_name, NULL,
+ hw = at91_clk_register_system(regmap, name, NULL,
+ &AT91_CLK_PD_NAME(parent_name),
id, flags);
if (IS_ERR(hw))
continue;
@@ -928,6 +955,7 @@ static void __init of_at91sam9x5_clk_usb_setup(struct device_node *np)
struct clk_hw *hw;
unsigned int num_parents;
const char *parent_names[USB_SOURCE_MAX];
+ struct clk_parent_data parent_data[USB_SOURCE_MAX];
const char *name = np->name;
struct regmap *regmap;
struct device_node *parent_np;
@@ -946,7 +974,9 @@ static void __init of_at91sam9x5_clk_usb_setup(struct device_node *np)
if (IS_ERR(regmap))
return;
- hw = at91sam9x5_clk_register_usb(regmap, name, parent_names, NULL,
+ for (unsigned int i = 0; i < USB_SOURCE_MAX; i++)
+ parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
+ hw = at91sam9x5_clk_register_usb(regmap, name, NULL, parent_data,
num_parents);
if (IS_ERR(hw))
return;
@@ -976,7 +1006,7 @@ static void __init of_at91sam9n12_clk_usb_setup(struct device_node *np)
if (IS_ERR(regmap))
return;
- hw = at91sam9n12_clk_register_usb(regmap, name, parent_name, NULL);
+ hw = at91sam9n12_clk_register_usb(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
@@ -1009,7 +1039,8 @@ static void __init of_at91rm9200_clk_usb_setup(struct device_node *np)
of_node_put(parent_np);
if (IS_ERR(regmap))
return;
- hw = at91rm9200_clk_register_usb(regmap, name, parent_name, NULL, divisors);
+ hw = at91rm9200_clk_register_usb(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name),
+ divisors);
if (IS_ERR(hw))
return;
@@ -1056,7 +1087,8 @@ static void __init of_at91sam9x5_clk_utmi_setup(struct device_node *np)
regmap_sfr = NULL;
}
- hw = at91_clk_register_utmi(regmap_pmc, regmap_sfr, name, parent_name, NULL);
+ hw = at91_clk_register_utmi(regmap_pmc, regmap_sfr, name, NULL,
+ &AT91_CLK_PD_NAME(parent_name));
if (IS_ERR(hw))
return;
--
2.43.0Hi, Ryan,
On 9/19/25 00:16, Ryan.Wanner@microchip.com wrote:
> From: Claudiu Beznea <claudiu.beznea@tuxon.dev>
>
> Switch old dt-compat clocks to use parent_hw and parent_data. Having
> parent_hw instead of parent names improves to clock registration
> speed and re-parenting.
>
> Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
> ---
> drivers/clk/at91/dt-compat.c | 80 +++++++++++++++++++++++++-----------
> 1 file changed, 56 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
> index fa8658d3be7b..9ca871b817e0 100644
> --- a/drivers/clk/at91/dt-compat.c
> +++ b/drivers/clk/at91/dt-compat.c
> @@ -43,7 +43,8 @@ static void __init of_sama5d2_clk_audio_pll_frac_setup(struct device_node *np)
>
> parent_name = of_clk_get_parent_name(np, 0);
>
> - hw = at91_clk_register_audio_pll_frac(regmap, name, parent_name, NULL);
> + hw = at91_clk_register_audio_pll_frac(regmap, name, NULL,
> + &AT91_CLK_PD_NAME(parent_name));
> if (IS_ERR(hw))
> return;
>
> @@ -69,7 +70,8 @@ static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np)
>
> parent_name = of_clk_get_parent_name(np, 0);
>
> - hw = at91_clk_register_audio_pll_pad(regmap, name, parent_name, NULL);
> + hw = at91_clk_register_audio_pll_pad(regmap, name, NULL,
> + &AT91_CLK_PD_NAME(parent_name));
> if (IS_ERR(hw))
> return;
>
> @@ -95,7 +97,7 @@ static void __init of_sama5d2_clk_audio_pll_pmc_setup(struct device_node *np)
>
> parent_name = of_clk_get_parent_name(np, 0);
>
> - hw = at91_clk_register_audio_pll_pmc(regmap, name, parent_name, NULL);
> + hw = at91_clk_register_audio_pll_pmc(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
> if (IS_ERR(hw))
> return;
>
> @@ -129,6 +131,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
> struct clk_hw *hw;
> unsigned int num_parents;
> const char *parent_names[GENERATED_SOURCE_MAX];
> + struct clk_parent_data parent_data[GENERATED_SOURCE_MAX];
> struct device_node *gcknp, *parent_np;
> struct clk_range range = CLK_RANGE(0, 0);
> struct regmap *regmap;
> @@ -149,6 +152,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
> if (IS_ERR(regmap))
> return;
>
> + for (unsigned int i = 0; i < num_parents; i++)
> + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
> for_each_child_of_node(np, gcknp) {
> int chg_pid = INT_MIN;
>
> @@ -171,7 +176,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
>
> hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
> &dt_pcr_layout, name,
> - parent_names, NULL, NULL,
> + NULL, parent_data, NULL,
> num_parents, id, &range,
> chg_pid);
> if (IS_ERR(hw))
> @@ -201,7 +206,7 @@ static void __init of_sama5d4_clk_h32mx_setup(struct device_node *np)
>
> parent_name = of_clk_get_parent_name(np, 0);
>
> - hw = at91_clk_register_h32mx(regmap, name, parent_name, NULL);
> + hw = at91_clk_register_h32mx(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
> if (IS_ERR(hw))
> return;
>
> @@ -228,6 +233,8 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
> return;
>
> for_each_child_of_node(np, i2s_mux_np) {
> + struct clk_parent_data parent_data[2];
> +
> if (of_property_read_u8(i2s_mux_np, "reg", &bus_id))
> continue;
>
> @@ -238,8 +245,10 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
> if (ret != 2)
> continue;
>
> + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
> + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
> hw = at91_clk_i2s_mux_register(regmap_sfr, i2s_mux_np->name,
> - parent_names, NULL, 2, bus_id);
> + NULL, parent_data, 2, bus_id);
> if (IS_ERR(hw))
> continue;
>
> @@ -269,7 +278,8 @@ static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np)
> if (IS_ERR(regmap))
> return;
>
> - hw = at91_clk_register_main_osc(regmap, name, parent_name, NULL, bypass);
> + hw = at91_clk_register_main_osc(regmap, name, NULL,
> + &AT91_CLK_PD_NAME(parent_name), bypass);
> if (IS_ERR(hw))
> return;
>
> @@ -323,7 +333,7 @@ static void __init of_at91rm9200_clk_main_setup(struct device_node *np)
> if (IS_ERR(regmap))
> return;
>
> - hw = at91_clk_register_rm9200_main(regmap, name, parent_name, NULL);
> + hw = at91_clk_register_rm9200_main(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
> if (IS_ERR(hw))
> return;
>
> @@ -336,6 +346,7 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
> {
> struct clk_hw *hw;
> const char *parent_names[2];
> + struct clk_parent_data parent_data[2];
> unsigned int num_parents;
> const char *name = np->name;
> struct regmap *regmap;
> @@ -354,7 +365,9 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
>
> of_property_read_string(np, "clock-output-names", &name);
>
> - hw = at91_clk_register_sam9x5_main(regmap, name, parent_names, NULL,
> + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
> + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
> + hw = at91_clk_register_sam9x5_main(regmap, name, NULL, parent_data,
> num_parents);
> if (IS_ERR(hw))
> return;
> @@ -396,6 +409,7 @@ of_at91_clk_master_setup(struct device_node *np,
> struct clk_hw *hw;
> unsigned int num_parents;
> const char *parent_names[MASTER_SOURCE_MAX];
> + struct clk_parent_data parent_data[MASTER_SOURCE_MAX];
> const char *name = np->name;
> struct clk_master_characteristics *characteristics;
> struct regmap *regmap;
> @@ -419,13 +433,15 @@ of_at91_clk_master_setup(struct device_node *np,
> if (IS_ERR(regmap))
> return;
>
> + for (unsigned int i = 0; i < MASTER_SOURCE_MAX; i++)
> + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
> hw = at91_clk_register_master_pres(regmap, "masterck_pres", num_parents,
> - parent_names, NULL, layout,
> + NULL, parent_data, layout,
> characteristics, &mck_lock);
> if (IS_ERR(hw))
> goto out_free_characteristics;
>
> - hw = at91_clk_register_master_div(regmap, name, "masterck_pres", NULL,
> + hw = at91_clk_register_master_div(regmap, name, NULL, &AT91_CLK_PD_HW(hw),
> layout, characteristics,
> &mck_lock, CLK_SET_RATE_GATE, 0);
Looks like at91_clk_register_master_div() could be kept to use parent_hws
instead of parent_data.
On 10/20/25 12:15, Claudiu Beznea wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Hi, Ryan,
>
> On 9/19/25 00:16, Ryan.Wanner@microchip.com wrote:
>> From: Claudiu Beznea <claudiu.beznea@tuxon.dev>
>>
>> Switch old dt-compat clocks to use parent_hw and parent_data. Having
>> parent_hw instead of parent names improves to clock registration
>> speed and re-parenting.
>>
>> Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
>> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
>> ---
>> drivers/clk/at91/dt-compat.c | 80 +++++++++++++++++++++++++-----------
>> 1 file changed, 56 insertions(+), 24 deletions(-)
>>
>> diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
>> index fa8658d3be7b..9ca871b817e0 100644
>> --- a/drivers/clk/at91/dt-compat.c
>> +++ b/drivers/clk/at91/dt-compat.c
>> @@ -43,7 +43,8 @@ static void __init of_sama5d2_clk_audio_pll_frac_setup(struct device_node *np)
>>
>> parent_name = of_clk_get_parent_name(np, 0);
>>
>> - hw = at91_clk_register_audio_pll_frac(regmap, name, parent_name, NULL);
>> + hw = at91_clk_register_audio_pll_frac(regmap, name, NULL,
>> + &AT91_CLK_PD_NAME(parent_name));
>> if (IS_ERR(hw))
>> return;
>>
>> @@ -69,7 +70,8 @@ static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np)
>>
>> parent_name = of_clk_get_parent_name(np, 0);
>>
>> - hw = at91_clk_register_audio_pll_pad(regmap, name, parent_name, NULL);
>> + hw = at91_clk_register_audio_pll_pad(regmap, name, NULL,
>> + &AT91_CLK_PD_NAME(parent_name));
>> if (IS_ERR(hw))
>> return;
>>
>> @@ -95,7 +97,7 @@ static void __init of_sama5d2_clk_audio_pll_pmc_setup(struct device_node *np)
>>
>> parent_name = of_clk_get_parent_name(np, 0);
>>
>> - hw = at91_clk_register_audio_pll_pmc(regmap, name, parent_name, NULL);
>> + hw = at91_clk_register_audio_pll_pmc(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
>> if (IS_ERR(hw))
>> return;
>>
>> @@ -129,6 +131,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
>> struct clk_hw *hw;
>> unsigned int num_parents;
>> const char *parent_names[GENERATED_SOURCE_MAX];
>> + struct clk_parent_data parent_data[GENERATED_SOURCE_MAX];
>> struct device_node *gcknp, *parent_np;
>> struct clk_range range = CLK_RANGE(0, 0);
>> struct regmap *regmap;
>> @@ -149,6 +152,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
>> if (IS_ERR(regmap))
>> return;
>>
>> + for (unsigned int i = 0; i < num_parents; i++)
>> + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
>> for_each_child_of_node(np, gcknp) {
>> int chg_pid = INT_MIN;
>>
>> @@ -171,7 +176,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
>>
>> hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
>> &dt_pcr_layout, name,
>> - parent_names, NULL, NULL,
>> + NULL, parent_data, NULL,
>> num_parents, id, &range,
>> chg_pid);
>> if (IS_ERR(hw))
>> @@ -201,7 +206,7 @@ static void __init of_sama5d4_clk_h32mx_setup(struct device_node *np)
>>
>> parent_name = of_clk_get_parent_name(np, 0);
>>
>> - hw = at91_clk_register_h32mx(regmap, name, parent_name, NULL);
>> + hw = at91_clk_register_h32mx(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
>> if (IS_ERR(hw))
>> return;
>>
>> @@ -228,6 +233,8 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
>> return;
>>
>> for_each_child_of_node(np, i2s_mux_np) {
>> + struct clk_parent_data parent_data[2];
>> +
>> if (of_property_read_u8(i2s_mux_np, "reg", &bus_id))
>> continue;
>>
>> @@ -238,8 +245,10 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
>> if (ret != 2)
>> continue;
>>
>> + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
>> + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
>> hw = at91_clk_i2s_mux_register(regmap_sfr, i2s_mux_np->name,
>> - parent_names, NULL, 2, bus_id);
>> + NULL, parent_data, 2, bus_id);
>> if (IS_ERR(hw))
>> continue;
>>
>> @@ -269,7 +278,8 @@ static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np)
>> if (IS_ERR(regmap))
>> return;
>>
>> - hw = at91_clk_register_main_osc(regmap, name, parent_name, NULL, bypass);
>> + hw = at91_clk_register_main_osc(regmap, name, NULL,
>> + &AT91_CLK_PD_NAME(parent_name), bypass);
>> if (IS_ERR(hw))
>> return;
>>
>> @@ -323,7 +333,7 @@ static void __init of_at91rm9200_clk_main_setup(struct device_node *np)
>> if (IS_ERR(regmap))
>> return;
>>
>> - hw = at91_clk_register_rm9200_main(regmap, name, parent_name, NULL);
>> + hw = at91_clk_register_rm9200_main(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
>> if (IS_ERR(hw))
>> return;
>>
>> @@ -336,6 +346,7 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
>> {
>> struct clk_hw *hw;
>> const char *parent_names[2];
>> + struct clk_parent_data parent_data[2];
>> unsigned int num_parents;
>> const char *name = np->name;
>> struct regmap *regmap;
>> @@ -354,7 +365,9 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
>>
>> of_property_read_string(np, "clock-output-names", &name);
>>
>> - hw = at91_clk_register_sam9x5_main(regmap, name, parent_names, NULL,
>> + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
>> + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
>> + hw = at91_clk_register_sam9x5_main(regmap, name, NULL, parent_data,
>> num_parents);
>> if (IS_ERR(hw))
>> return;
>> @@ -396,6 +409,7 @@ of_at91_clk_master_setup(struct device_node *np,
>> struct clk_hw *hw;
>> unsigned int num_parents;
>> const char *parent_names[MASTER_SOURCE_MAX];
>> + struct clk_parent_data parent_data[MASTER_SOURCE_MAX];
>> const char *name = np->name;
>> struct clk_master_characteristics *characteristics;
>> struct regmap *regmap;
>> @@ -419,13 +433,15 @@ of_at91_clk_master_setup(struct device_node *np,
>> if (IS_ERR(regmap))
>> return;
>>
>> + for (unsigned int i = 0; i < MASTER_SOURCE_MAX; i++)
>> + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
>> hw = at91_clk_register_master_pres(regmap, "masterck_pres", num_parents,
>> - parent_names, NULL, layout,
>> + NULL, parent_data, layout,
>> characteristics, &mck_lock);
>> if (IS_ERR(hw))
>> goto out_free_characteristics;
>>
>> - hw = at91_clk_register_master_div(regmap, name, "masterck_pres", NULL,
>> + hw = at91_clk_register_master_div(regmap, name, NULL, &AT91_CLK_PD_HW(hw),
>> layout, characteristics,
>> &mck_lock, CLK_SET_RATE_GATE, 0);
>
> Looks like at91_clk_register_master_div() could be kept to use parent_hws
> instead of parent_data.
Looking into this more the register_master_div calls
at91_clk_register_master_internal() which is used for all of the SoCs.
Some of the SoCs that use this function only have the parents passed in
by name string and not clk_hw. Would it be wise to add another function
for this to account for clk_hw and parent name? Or keep the use of
parent_data?
Ryan
On 1/9/26 19:03, Ryan Wanner wrote:
> On 10/20/25 12:15, Claudiu Beznea wrote:
>> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>>
>> Hi, Ryan,
>>
>> On 9/19/25 00:16, Ryan.Wanner@microchip.com wrote:
>>> From: Claudiu Beznea <claudiu.beznea@tuxon.dev>
>>>
>>> Switch old dt-compat clocks to use parent_hw and parent_data. Having
>>> parent_hw instead of parent names improves to clock registration
>>> speed and re-parenting.
>>>
>>> Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
>>> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
>>> ---
>>> drivers/clk/at91/dt-compat.c | 80 +++++++++++++++++++++++++-----------
>>> 1 file changed, 56 insertions(+), 24 deletions(-)
>>>
>>> diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c
>>> index fa8658d3be7b..9ca871b817e0 100644
>>> --- a/drivers/clk/at91/dt-compat.c
>>> +++ b/drivers/clk/at91/dt-compat.c
>>> @@ -43,7 +43,8 @@ static void __init of_sama5d2_clk_audio_pll_frac_setup(struct device_node *np)
>>>
>>> parent_name = of_clk_get_parent_name(np, 0);
>>>
>>> - hw = at91_clk_register_audio_pll_frac(regmap, name, parent_name, NULL);
>>> + hw = at91_clk_register_audio_pll_frac(regmap, name, NULL,
>>> + &AT91_CLK_PD_NAME(parent_name));
>>> if (IS_ERR(hw))
>>> return;
>>>
>>> @@ -69,7 +70,8 @@ static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np)
>>>
>>> parent_name = of_clk_get_parent_name(np, 0);
>>>
>>> - hw = at91_clk_register_audio_pll_pad(regmap, name, parent_name, NULL);
>>> + hw = at91_clk_register_audio_pll_pad(regmap, name, NULL,
>>> + &AT91_CLK_PD_NAME(parent_name));
>>> if (IS_ERR(hw))
>>> return;
>>>
>>> @@ -95,7 +97,7 @@ static void __init of_sama5d2_clk_audio_pll_pmc_setup(struct device_node *np)
>>>
>>> parent_name = of_clk_get_parent_name(np, 0);
>>>
>>> - hw = at91_clk_register_audio_pll_pmc(regmap, name, parent_name, NULL);
>>> + hw = at91_clk_register_audio_pll_pmc(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
>>> if (IS_ERR(hw))
>>> return;
>>>
>>> @@ -129,6 +131,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
>>> struct clk_hw *hw;
>>> unsigned int num_parents;
>>> const char *parent_names[GENERATED_SOURCE_MAX];
>>> + struct clk_parent_data parent_data[GENERATED_SOURCE_MAX];
>>> struct device_node *gcknp, *parent_np;
>>> struct clk_range range = CLK_RANGE(0, 0);
>>> struct regmap *regmap;
>>> @@ -149,6 +152,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
>>> if (IS_ERR(regmap))
>>> return;
>>>
>>> + for (unsigned int i = 0; i < num_parents; i++)
>>> + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
>>> for_each_child_of_node(np, gcknp) {
>>> int chg_pid = INT_MIN;
>>>
>>> @@ -171,7 +176,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np)
>>>
>>> hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
>>> &dt_pcr_layout, name,
>>> - parent_names, NULL, NULL,
>>> + NULL, parent_data, NULL,
>>> num_parents, id, &range,
>>> chg_pid);
>>> if (IS_ERR(hw))
>>> @@ -201,7 +206,7 @@ static void __init of_sama5d4_clk_h32mx_setup(struct device_node *np)
>>>
>>> parent_name = of_clk_get_parent_name(np, 0);
>>>
>>> - hw = at91_clk_register_h32mx(regmap, name, parent_name, NULL);
>>> + hw = at91_clk_register_h32mx(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
>>> if (IS_ERR(hw))
>>> return;
>>>
>>> @@ -228,6 +233,8 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
>>> return;
>>>
>>> for_each_child_of_node(np, i2s_mux_np) {
>>> + struct clk_parent_data parent_data[2];
>>> +
>>> if (of_property_read_u8(i2s_mux_np, "reg", &bus_id))
>>> continue;
>>>
>>> @@ -238,8 +245,10 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np)
>>> if (ret != 2)
>>> continue;
>>>
>>> + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
>>> + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
>>> hw = at91_clk_i2s_mux_register(regmap_sfr, i2s_mux_np->name,
>>> - parent_names, NULL, 2, bus_id);
>>> + NULL, parent_data, 2, bus_id);
>>> if (IS_ERR(hw))
>>> continue;
>>>
>>> @@ -269,7 +278,8 @@ static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np)
>>> if (IS_ERR(regmap))
>>> return;
>>>
>>> - hw = at91_clk_register_main_osc(regmap, name, parent_name, NULL, bypass);
>>> + hw = at91_clk_register_main_osc(regmap, name, NULL,
>>> + &AT91_CLK_PD_NAME(parent_name), bypass);
>>> if (IS_ERR(hw))
>>> return;
>>>
>>> @@ -323,7 +333,7 @@ static void __init of_at91rm9200_clk_main_setup(struct device_node *np)
>>> if (IS_ERR(regmap))
>>> return;
>>>
>>> - hw = at91_clk_register_rm9200_main(regmap, name, parent_name, NULL);
>>> + hw = at91_clk_register_rm9200_main(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name));
>>> if (IS_ERR(hw))
>>> return;
>>>
>>> @@ -336,6 +346,7 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
>>> {
>>> struct clk_hw *hw;
>>> const char *parent_names[2];
>>> + struct clk_parent_data parent_data[2];
>>> unsigned int num_parents;
>>> const char *name = np->name;
>>> struct regmap *regmap;
>>> @@ -354,7 +365,9 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np)
>>>
>>> of_property_read_string(np, "clock-output-names", &name);
>>>
>>> - hw = at91_clk_register_sam9x5_main(regmap, name, parent_names, NULL,
>>> + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0]);
>>> + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1]);
>>> + hw = at91_clk_register_sam9x5_main(regmap, name, NULL, parent_data,
>>> num_parents);
>>> if (IS_ERR(hw))
>>> return;
>>> @@ -396,6 +409,7 @@ of_at91_clk_master_setup(struct device_node *np,
>>> struct clk_hw *hw;
>>> unsigned int num_parents;
>>> const char *parent_names[MASTER_SOURCE_MAX];
>>> + struct clk_parent_data parent_data[MASTER_SOURCE_MAX];
>>> const char *name = np->name;
>>> struct clk_master_characteristics *characteristics;
>>> struct regmap *regmap;
>>> @@ -419,13 +433,15 @@ of_at91_clk_master_setup(struct device_node *np,
>>> if (IS_ERR(regmap))
>>> return;
>>>
>>> + for (unsigned int i = 0; i < MASTER_SOURCE_MAX; i++)
>>> + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i]);
>>> hw = at91_clk_register_master_pres(regmap, "masterck_pres", num_parents,
>>> - parent_names, NULL, layout,
>>> + NULL, parent_data, layout,
>>> characteristics, &mck_lock);
>>> if (IS_ERR(hw))
>>> goto out_free_characteristics;
>>>
>>> - hw = at91_clk_register_master_div(regmap, name, "masterck_pres", NULL,
>>> + hw = at91_clk_register_master_div(regmap, name, NULL, &AT91_CLK_PD_HW(hw),
>>> layout, characteristics,
>>> &mck_lock, CLK_SET_RATE_GATE, 0);
>>
>> Looks like at91_clk_register_master_div() could be kept to use parent_hws
>> instead of parent_data.
>
> Looking into this more the register_master_div calls
> at91_clk_register_master_internal() which is used for all of the SoCs.
> Some of the SoCs that use this function only have the parents passed in
> by name string and not clk_hw. Would it be wise to add another function
> for this to account for clk_hw and parent name? Or keep the use of
> parent_data?
Let's keep it as is for now.
Thank you,
Claudiu
© 2016 - 2026 Red Hat, Inc.