* [PATCH] clk: at91: fix masterck name
@ 2019-02-08 14:40 Alexandre Belloni
2019-02-08 15:53 ` Nicolas.Ferre
2019-02-20 19:43 ` Stephen Boyd
0 siblings, 2 replies; 4+ messages in thread
From: Alexandre Belloni @ 2019-02-08 14:40 UTC (permalink / raw)
To: Stephen Boyd
Cc: Nicolas Ferre, Michael Turquette, linux-clk, devicetree,
linux-arm-kernel, linux-kernel, Alexandre Belloni
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@bootlin.com>
---
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];
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] clk: at91: fix masterck name
2019-02-08 14:40 [PATCH] clk: at91: fix masterck name Alexandre Belloni
@ 2019-02-08 15:53 ` Nicolas.Ferre
2019-02-20 11:27 ` Nicolas.Ferre
2019-02-20 19:43 ` Stephen Boyd
1 sibling, 1 reply; 4+ messages in thread
From: Nicolas.Ferre @ 2019-02-08 15:53 UTC (permalink / raw)
To: alexandre.belloni, sboyd
Cc: mturquette, linux-clk, devicetree, linux-arm-kernel, linux-kernel
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@bootlin.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] clk: at91: fix masterck name
2019-02-08 15:53 ` Nicolas.Ferre
@ 2019-02-20 11:27 ` Nicolas.Ferre
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas.Ferre @ 2019-02-20 11:27 UTC (permalink / raw)
To: alexandre.belloni, sboyd
Cc: mturquette, linux-clk, devicetree, linux-arm-kernel, linux-kernel
On 08/02/2019 at 16:53, Nicolas.Ferre@microchip.com 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@bootlin.com>
>
> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
+
Cc: <stable@vger.kernel.org> # 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clk: at91: fix masterck name
2019-02-08 14:40 [PATCH] clk: at91: fix masterck name Alexandre Belloni
2019-02-08 15:53 ` Nicolas.Ferre
@ 2019-02-20 19:43 ` Stephen Boyd
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Boyd @ 2019-02-20 19:43 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Nicolas Ferre, Michael Turquette, linux-clk, devicetree,
linux-arm-kernel, linux-kernel, Alexandre Belloni
Quoting Alexandre Belloni (2019-02-08 06:40:59)
> 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@bootlin.com>
> ---
Applied to clk-fixes
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-20 19:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-08 14:40 [PATCH] clk: at91: fix masterck name Alexandre Belloni
2019-02-08 15:53 ` Nicolas.Ferre
2019-02-20 11:27 ` Nicolas.Ferre
2019-02-20 19:43 ` Stephen Boyd
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).