On 08/02/2019 at 16:53, Nicolas.Ferre@xxxxxxxxxxxxx wrote:
> On 08/02/2019 at 15:40, Alexandre Belloni wrote:
>> The master clock is actually named masterck earlier in the driver. Having
>> "mck" in the parent list means that it can never be selected.
>>
>> Fixes: 1eabdc2f9dd8 ("clk: at91: add at91sam9x5 PMCs driver")
>> Fixes: a2038077de9a ("clk: at91: add sama5d2 PMC driver")
>> Fixes: 084b696bb509 ("clk: at91: add sama5d4 pmc driver")
>>
>> Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
>
> Acked-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx>
+
Cc: <stable@xxxxxxxxxxxxxxx> # v4.20+
Stephen (ping),
This patch together with the one sent today "[PATCH] clk: at91: fix
at91sam9x5 peripheral clock number" make a good set for 5.0-final as
they basically are real regressions.
This is true even if they apply on 4.20 as we were using an older biding
definition until 5.0-rc...
Do what you can... As it's really late, I know...
Best regards,
Nicolas
>> ---
>> drivers/clk/at91/at91sam9x5.c | 2 +-
>> drivers/clk/at91/sama5d2.c | 4 ++--
>> drivers/clk/at91/sama5d4.c | 2 +-
>> 3 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/clk/at91/at91sam9x5.c b/drivers/clk/at91/at91sam9x5.c
>> index 2fe225a697df..d55a151cb7f5 100644
>> --- a/drivers/clk/at91/at91sam9x5.c
>> +++ b/drivers/clk/at91/at91sam9x5.c
>> @@ -210,7 +210,7 @@ static void __init at91sam9x5_pmc_setup(struct device_node *np,
>> parent_names[1] = "mainck";
>> parent_names[2] = "plladivck";
>> parent_names[3] = "utmick";
>> - parent_names[4] = "mck";
>> + parent_names[4] = "masterck";
>> for (i = 0; i < 2; i++) {
>> char name[6];
>>
>> diff --git a/drivers/clk/at91/sama5d2.c b/drivers/clk/at91/sama5d2.c
>> index d69ad96fe988..cd0ef7274fdb 100644
>> --- a/drivers/clk/at91/sama5d2.c
>> +++ b/drivers/clk/at91/sama5d2.c
>> @@ -240,7 +240,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
>> parent_names[1] = "mainck";
>> parent_names[2] = "plladivck";
>> parent_names[3] = "utmick";
>> - parent_names[4] = "mck";
>> + parent_names[4] = "masterck";
>> for (i = 0; i < 3; i++) {
>> char name[6];
>>
>> @@ -291,7 +291,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np)
>> parent_names[1] = "mainck";
>> parent_names[2] = "plladivck";
>> parent_names[3] = "utmick";
>> - parent_names[4] = "mck";
>> + parent_names[4] = "masterck";
>> parent_names[5] = "audiopll_pmcck";
>> for (i = 0; i < ARRAY_SIZE(sama5d2_gck); i++) {
>> hw = at91_clk_register_generated(regmap, &pmc_pcr_lock,
>> diff --git a/drivers/clk/at91/sama5d4.c b/drivers/clk/at91/sama5d4.c
>> index e358be7f6c8d..b645a9d59cdb 100644
>> --- a/drivers/clk/at91/sama5d4.c
>> +++ b/drivers/clk/at91/sama5d4.c
>> @@ -207,7 +207,7 @@ static void __init sama5d4_pmc_setup(struct device_node *np)
>> parent_names[1] = "mainck";
>> parent_names[2] = "plladivck";
>> parent_names[3] = "utmick";
>> - parent_names[4] = "mck";
>> + parent_names[4] = "masterck";
>> for (i = 0; i < 3; i++) {
>> char name[6];
>>
>>
>
>
--
Nicolas Ferre
