AT91 SAMA7 SoC Clock Adjustments

From: Ryan Wanner <[email protected]>

The slow xtal is not described correctly as a parent, the driver looks for a "slow_xtal" string which is incorrect and will not work with the new formating of xtals.

To avoid this and keep this driver backwards compatible the parent_data.fw_name is replaced with parent_data.name and the original parent_data.name is replaced with parent_data.index. Using the index is safe due to the driver requiring only 1 xtal.

Fixes 8aa1db9ccee0e ("clk: at91: sckc: switch to parent_data/parent_hw")

Signed-off-by Ryan Wanner <[email protected]>

---
 drivers/clk/at91/sckc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/clk/at91/sckc.c +6 -6

index 021d1b412af4..952a805b6f7e 100644
@@ -374,7 +374,7 @@ static void __init at91sam9x5_sckc_register(struct device_node *np,
 	const char *xtal_name;
 	struct clk_hw *slow_rc, *slow_osc, *slowck;
 	static struct clk_parent_data parent_data = {
-		.name = "slow_xtal",
+		.index = 0,
 	};
 	const struct clk_hw *parent_hws[2];
 	bool bypass;

@@ -407,7 +407,7 @@ static void __init at91sam9x5_sckc_register(struct device_node *np,
 	if (!xtal_name)
 		goto unregister_slow_rc;
 
-	parent_data.fw_name = xtal_name;
+	parent_data.name = xtal_name;
 
 	slow_osc = at91_clk_register_slow_osc(regbase, "slow_osc",
 					      &parent_data, 1200000, bypass, bits);

@@ -476,7 +476,7 @@ static void __init of_sam9x60_sckc_setup(struct device_node *np)
 	const char *xtal_name;
 	const struct clk_hw *parent_hws[2];
 	static struct clk_parent_data parent_data = {
-		.name = "slow_xtal",
+		.index = 0,
 	};
 	bool bypass;
 	int ret;

@@ -494,7 +494,7 @@ static void __init of_sam9x60_sckc_setup(struct device_node *np)
 	if (!xtal_name)
 		goto unregister_slow_rc;
 
-	parent_data.fw_name = xtal_name;
+	parent_data.name = xtal_name;
 	bypass = of_property_read_bool(np, "atmel,osc-bypass");
 	slow_osc = at91_clk_register_slow_osc(regbase, "slow_osc",
 					      &parent_data, 5000000, bypass,

@@ -592,7 +592,7 @@ static void __init of_sama5d4_sckc_setup(struct device_node *np)
 	const char *xtal_name;
 	const struct clk_hw *parent_hws[2];
 	static struct clk_parent_data parent_data = {
-		.name = "slow_xtal",
+		.index = 0,
 	};
 	int ret;
 

@@ -609,7 +609,7 @@ static void __init of_sama5d4_sckc_setup(struct device_node *np)
 	xtal_name = of_clk_get_parent_name(np, 0);
 	if (!xtal_name)
 		goto unregister_slow_rc;
-	parent_data.fw_name = xtal_name;
+	parent_data.name = xtal_name;
 
 	osc = kzalloc(sizeof(*osc), GFP_KERNEL);
 	if (!osc)

From: Ryan Wanner <[email protected]>

The main_xtal clk_hw struct is not passed into parent_data.hw causing an issue with main_osc parent.

Passing the main_xtal struct into the
parent_data struct will ensure the correct parent structure.

Signed-off-by Ryan Wanner <[email protected]>

---
 drivers/clk/at91/sama7d65.c | 1 +
 1 file changed, 1 insertion(+)

drivers/clk/at91/sama7d65.c +0 -0

index a5d40df8b2f2..08306261c9c7 100644

drivers/clk/at91/sama7d65.c +0 -0

 	main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL,
 						 &parent_data, bypass);
 	if (IS_ERR(main_osc_hw))

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

Hi, Ryan,

Quoted 4 lines · On 25.03.2025 17:55, [email protected] wrote:

From: Ryan Wanner <[email protected]>

The main_xtal clk_hw struct is not passed into parent_data.hw causing an issue with main_osc parent.

Can you please describe the issue?

Quoted 13 lines

Passing the main_xtal struct into the
parent_data struct will ensure the correct parent structure.

Signed-off-by Ryan Wanner <[email protected]>

---
 drivers/clk/at91/sama7d65.c | 1 +
 1 file changed, 1 insertion(+)

drivers/clk/at91/sama7d65.c +0 -0

index a5d40df8b2f2..08306261c9c7 100644

drivers/clk/at91/sama7d65.c static void __init sama7d65_pmc_setup(struct device_node *np) · line 1141

Quoted 4 lines

drivers/clk/at91/sama7d65.c +1 -0

@@ -1138,6 +1138,7 @@ static void __init sama7d65_pmc_setup(struct device_node *np)
 
      parent_data.name = main_xtal_name;
      parent_data.fw_name = main_xtal_name;
+     parent_data.hw = main_xtal_hw;

I think, from time to time, you can still hit some random failure as the parent_data.index is still not initialized. I think the problem may be solved by doing something like:

(quoted diff) +1 -1

-       static struct clk_parent_data parent_data;
+       static struct clk_parent_data parent_data = {0};

Can you please check with this?

Thank you,
Claudiu

Quoted 3 lines

drivers/clk/at91/sama7d65.c +0 -0

      main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL,
                                               &parent_data, bypass);
      if (IS_ERR(main_osc_hw))