clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT
Subsystems (3)
PATCH 1/1 clk: at91: sama7g5: Allow MCK1 to be exported and referenced in DT
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.
--- drivers/clk/at91/sama7g5.c | 8 +++++++- include/dt-bindings/clock/at91.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/clk/at91/sama7g5.c +7 -1
@@ -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" );
include/dt-bindings/clock/at91.h +1 -0
@@ -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 */
Signature · 1 line
2.25.1
Quoted 6 lines · 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_COREclock from phandle in DT.Signed-off-by Tudor Ambarus <[email protected]>
Quoted 64 lines
--- drivers/clk/at91/sama7g5.c | 8 +++++++- include/dt-bindings/clock/at91.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-)drivers/clk/at91/sama7g5.c +7
-1@@ -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" );include/dt-bindings/clock/at91.h +1
-0@@ -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 */
Quoting Tudor Ambarus (2022-01-11 04:53:10)
Quoted 7 lines
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_COREclock from phandle in DT.Signed-off-by Tudor Ambarus <[email protected]>---
Applied to clk-next
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Nicolas Ferre
maintainerQuoted 10 lines · Stephen Boyd
Quoting Tudor Ambarus (2022-01-11 04:53:10)
Quoted 7 lines
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_COREclock from phandle in DT.Signed-off-by Tudor Ambarus <[email protected]>---
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
Signature · 1 line
Nicolas Ferre
Nicolas Ferre
maintainerQuoted 14 lines · Nicolas Ferre
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 10 lines · Stephen Boyd
Quoting Tudor Ambarus (2022-01-11 04:53:10)
Quoted 7 lines
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_COREclock from phandle in DT.Signed-off-by Tudor Ambarus <[email protected]>---
Applied to clk-next
Quoted 8 lines
Hi Stephen,
I depend on the
PMC_MCK1definition 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
Quoted 12 lines
Tell me if there's a better way, as well.
Thanks, best regards,
Nicolas--
Nicolas Ferre_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 1 line
Nicolas Ferre