clk: at91: fix masterck name
Subsystems (2)
Alexandre Belloni
maintainerPATCH 1/1 clk: at91: fix masterck name
The master clock is actually named masterck earlier in the driver. Having "mck" in the parent list means that it can never be selected.
--- 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(-)
drivers/clk/at91/at91sam9x5.c +1 -1
@@ -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 ];
drivers/clk/at91/sama5d2.c +2 -2
@@ -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,
drivers/clk/at91/sama5d4.c +1 -1
@@ -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 ];
Signature · 1 line
2.20.1
Quoted 8 lines · 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 <[email protected]>
Quoted 55 lines
--- 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(-)drivers/clk/at91/at91sam9x5.c +1
-1@@ -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 ];drivers/clk/at91/sama5d2.c +2
-2@@ -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,drivers/clk/at91/sama5d4.c +1
-1@@ -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 ];
Signature · 1 line
Nicolas Ferre
[email protected]
maintainerQuoted 11 lines · On 08/02/2019 at 16:53, [email protected] wrote:
Quoted 8 lines · 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 <[email protected]>Acked-by Nicolas Ferre <[email protected]>
+
Cc: <[email protected]> # 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
Quoted 57 lines
Quoted 55 lines
--- 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(-)drivers/clk/at91/at91sam9x5.c +1
-1@@ -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 ];drivers/clk/at91/sama5d2.c +2
-2@@ -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,drivers/clk/at91/sama5d4.c +1
-1@@ -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 ];
Signature · 1 line
Nicolas Ferre
Quoting Alexandre Belloni (2019-02-08 06:40:59)
Quoted 9 lines
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 <[email protected]>---
Applied to clk-fixes