[PATCH] clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT

[PATCH] clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT

[Tudor Ambarus]

MCK1 feeds the External Bus Interface (EBI). EBI's clock rate is used
to translate EBI's timmings to SMC timings, thus we need to handle MCK1
in the EBI driver. Allow MCK1 to be referenced as a PMC_TYPE_CORE clock
from phandle in DT.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
 drivers/clk/at91/sama7g5.c       | 8 +++++++-
 include/dt-bindings/clock/at91.h | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c
index 369dfafabbca..e43458673afb 100644
--- a/drivers/clk/at91/sama7g5.c
+++ b/drivers/clk/at91/sama7g5.c
@@ -302,6 +302,7 @@ static const struct {
  * @ep_count:		extra parents count
  * @ep_mux_table:	mux table for extra parents
  * @id:			clock id
+ * @eid:		export index in sama7g5->chws[] array
  * @c:			true if clock is critical and cannot be disabled
  */
 static const struct {
@@ -311,6 +312,7 @@ static const struct {
 	u8 ep_count;
 	u8 ep_mux_table[4];
 	u8 id;
+	u8 eid;
 	u8 c;
 } sama7g5_mckx[] = {
 	{ .n = "mck1",
@@ -319,6 +321,7 @@ static const struct {
 	  .ep_mux_table = { 5, },
 	  .ep_count = 1,
 	  .ep_chg_id = INT_MIN,
+	  .eid = PMC_MCK1,
 	  .c = 1, },
 
 	{ .n = "mck2",
@@ -913,7 +916,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
 	if (IS_ERR(regmap))
 		return;
 
-	sama7g5_pmc = pmc_data_allocate(PMC_CPU + 1,
+	sama7g5_pmc = pmc_data_allocate(PMC_MCK1 + 1,
 					nck(sama7g5_systemck),
 					nck(sama7g5_periphck),
 					nck(sama7g5_gck), 8);
@@ -1027,6 +1030,9 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
 			goto err_free;
 
 		alloc_mem[alloc_mem_size++] = mux_table;
+
+		if (sama7g5_mckx[i].eid)
+			sama7g5_pmc->chws[sama7g5_mckx[i].eid] = hw;
 	}
 
 	hw = at91_clk_sama7g5_register_utmi(regmap, "utmick", "main_xtal");
diff --git a/include/dt-bindings/clock/at91.h b/include/dt-bindings/clock/at91.h
index 98e1b2ab6403..8498c0cd95fe 100644
--- a/include/dt-bindings/clock/at91.h
+++ b/include/dt-bindings/clock/at91.h
@@ -35,6 +35,7 @@
 #define PMC_AUDIOIOPLL		(PMC_MAIN + 7)
 #define PMC_ETHPLL		(PMC_MAIN + 8)
 #define PMC_CPU			(PMC_MAIN + 9)
+#define PMC_MCK1		(PMC_MAIN + 10)
 
 #ifndef AT91_PMC_MOSCS
 #define AT91_PMC_MOSCS		0		/* MOSCS Flag */
-- 
2.25.1

Re: [PATCH] clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT

[Claudiu.Beznea]

On 11.01.2022 14:53, Tudor Ambarus wrote:
> MCK1 feeds the External Bus Interface (EBI). EBI's clock rate is used
> to translate EBI's timmings to SMC timings, thus we need to handle MCK1
> in the EBI driver. Allow MCK1 to be referenced as a PMC_TYPE_CORE clock
> from phandle in DT.
> 
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>

Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>

> ---
>  drivers/clk/at91/sama7g5.c       | 8 +++++++-
>  include/dt-bindings/clock/at91.h | 1 +
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c
> index 369dfafabbca..e43458673afb 100644
> --- a/drivers/clk/at91/sama7g5.c
> +++ b/drivers/clk/at91/sama7g5.c
> @@ -302,6 +302,7 @@ static const struct {
>   * @ep_count:		extra parents count
>   * @ep_mux_table:	mux table for extra parents
>   * @id:			clock id
> + * @eid:		export index in sama7g5->chws[] array
>   * @c:			true if clock is critical and cannot be disabled
>   */
>  static const struct {
> @@ -311,6 +312,7 @@ static const struct {
>  	u8 ep_count;
>  	u8 ep_mux_table[4];
>  	u8 id;
> +	u8 eid;
>  	u8 c;
>  } sama7g5_mckx[] = {
>  	{ .n = "mck1",
> @@ -319,6 +321,7 @@ static const struct {
>  	  .ep_mux_table = { 5, },
>  	  .ep_count = 1,
>  	  .ep_chg_id = INT_MIN,
> +	  .eid = PMC_MCK1,
>  	  .c = 1, },
>  
>  	{ .n = "mck2",
> @@ -913,7 +916,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
>  	if (IS_ERR(regmap))
>  		return;
>  
> -	sama7g5_pmc = pmc_data_allocate(PMC_CPU + 1,
> +	sama7g5_pmc = pmc_data_allocate(PMC_MCK1 + 1,
>  					nck(sama7g5_systemck),
>  					nck(sama7g5_periphck),
>  					nck(sama7g5_gck), 8);
> @@ -1027,6 +1030,9 @@ static void __init sama7g5_pmc_setup(struct device_node *np)
>  			goto err_free;
>  
>  		alloc_mem[alloc_mem_size++] = mux_table;
> +
> +		if (sama7g5_mckx[i].eid)
> +			sama7g5_pmc->chws[sama7g5_mckx[i].eid] = hw;
>  	}
>  
>  	hw = at91_clk_sama7g5_register_utmi(regmap, "utmick", "main_xtal");
> diff --git a/include/dt-bindings/clock/at91.h b/include/dt-bindings/clock/at91.h
> index 98e1b2ab6403..8498c0cd95fe 100644
> --- a/include/dt-bindings/clock/at91.h
> +++ b/include/dt-bindings/clock/at91.h
> @@ -35,6 +35,7 @@
>  #define PMC_AUDIOIOPLL		(PMC_MAIN + 7)
>  #define PMC_ETHPLL		(PMC_MAIN + 8)
>  #define PMC_CPU			(PMC_MAIN + 9)
> +#define PMC_MCK1		(PMC_MAIN + 10)
>  
>  #ifndef AT91_PMC_MOSCS
>  #define AT91_PMC_MOSCS		0		/* MOSCS Flag */

Re: [PATCH] clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT

[Stephen Boyd]

Quoting Tudor Ambarus (2022-01-11 04:53:10)
> MCK1 feeds the External Bus Interface (EBI). EBI's clock rate is used
> to translate EBI's timmings to SMC timings, thus we need to handle MCK1
> in the EBI driver. Allow MCK1 to be referenced as a PMC_TYPE_CORE clock
> from phandle in DT.
> 
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---

Applied to clk-next

Re: [PATCH] clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT

[Nicolas Ferre]

On 25/01/2022 at 02:05, Stephen Boyd wrote:
> Quoting Tudor Ambarus (2022-01-11 04:53:10)
>> MCK1 feeds the External Bus Interface (EBI). EBI's clock rate is used
>> to translate EBI's timmings to SMC timings, thus we need to handle MCK1
>> in the EBI driver. Allow MCK1 to be referenced as a PMC_TYPE_CORE clock
>> from phandle in DT.
>>
>> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
>> ---
> 
> Applied to clk-next

Hi Stephen,

I depend on the PMC_MCK1 definition for some of the DT patches that I 
must queue for my pull request to arm-soc, for 5.18.

Would you mind doing an immutable branch for me to pull from, so that 
the build doesn't crash while the clock tree is not integrated yet with 
my patches?

Tell me if there's a better way, as well.

Thanks, best regards,
   Nicolas

-- 
Nicolas Ferre

Re: [PATCH] clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT

[Nicolas Ferre]

On 25/02/2022 at 11:31, Nicolas Ferre wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On 25/01/2022 at 02:05, Stephen Boyd wrote:
>> Quoting Tudor Ambarus (2022-01-11 04:53:10)
>>> MCK1 feeds the External Bus Interface (EBI). EBI's clock rate is used
>>> to translate EBI's timmings to SMC timings, thus we need to handle MCK1
>>> in the EBI driver. Allow MCK1 to be referenced as a PMC_TYPE_CORE clock
>>> from phandle in DT.
>>>
>>> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
>>> ---
>>
>> Applied to clk-next
> 
> Hi Stephen,
> 
> I depend on the PMC_MCK1 definition for some of the DT patches that I
> must queue for my pull request to arm-soc, for 5.18.
> 
> Would you mind doing an immutable branch for me to pull from, so that
> the build doesn't crash while the clock tree is not integrated yet with
> my patches?

Stephen,

I added the needed chunk in the DT patch. I don't need this anymore.

Best regards,
   Nicolas

> Tell me if there's a better way, as well.
> 
> Thanks, best regards,
>     Nicolas
> 
> --
> Nicolas Ferre
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel


-- 
Nicolas Ferre