Re: [PATCH v1 09/12] clk: at91: sam9x60: Allow enabling main_rc_osc through DT

Conor Dooley
2024-08-21T15:55:34Z

[-- Attachment #1: Type: text/plain, Size: 2307 bytes --]

On Wed, Aug 21, 2024 at 12:59:40PM +0200, Alexander Dahl wrote:
> SAM9X60 Datasheet (DS60001579G) Section "23.4 Product Dependencies"
> says:
>
> "The OTPC is clocked through the Power Management Controller (PMC).
> The user must power on the main RC oscillator and enable the
> peripheral clock of the OTPC prior to reading or writing the OTP
> memory."
>
> The code for enabling/disabling that clock is already present, it was
> just not possible to hook into DT anymore, after at91 clk devicetree
> binding rework back in 2018 for kernel v4.19.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> ---
> drivers/clk/at91/sam9x60.c | 3 ++-
> include/dt-bindings/clock/at91.h | 1 +

Generally we don't want binding changes in the same patch as a driver
change. If your fix was determined to be faulty down the line and
reverted, the binding change would remain valid, for example. Can you
split it into two patches please, for the next version please?

> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/at91/sam9x60.c b/drivers/clk/at91/sam9x60.c
> index e309cbf3cb9a..4d5ee20b8fc4 100644
> --- a/drivers/clk/at91/sam9x60.c
> +++ b/drivers/clk/at91/sam9x60.c
> @@ -207,7 +207,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
> if (IS_ERR(regmap))
> return;
>
> - sam9x60_pmc = pmc_data_allocate(PMC_PLLACK + 1,
> + sam9x60_pmc = pmc_data_allocate(PMC_MAIN_RC + 1,
> nck(sam9x60_systemck),
> nck(sam9x60_periphck),
> nck(sam9x60_gck), 8);
> @@ -218,6 +218,7 @@ static void __init sam9x60_pmc_setup(struct device_node *np)
> 50000000);
> if (IS_ERR(hw))
> goto err_free;
> + sam9x60_pmc->chws[PMC_MAIN_RC] = hw;
>
> hw = at91_clk_register_main_osc(regmap, "main_osc", mainxtal_name, NULL, 0);
> if (IS_ERR(hw))
> diff --git a/include/dt-bindings/clock/at91.h b/include/dt-bindings/clock/at91.h
> index 3e3972a814c1..f957625cb3ac 100644
> --- a/include/dt-bindings/clock/at91.h
> +++ b/include/dt-bindings/clock/at91.h
> @@ -25,6 +25,7 @@
> #define PMC_PLLBCK 8
> #define PMC_AUDIOPLLCK 9
> #define PMC_AUDIOPINCK 10
> +#define PMC_MAIN_RC 11
>
> /* SAMA7G5 */
> #define PMC_CPUPLL (PMC_MAIN + 1)
> --
> 2.39.2
>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]