Skip to contentSkip to conversation

clk: at91: fix masterck name

PATCH Applied Alexandre Belloni 3 participants 4 messages Feb 8, 2019 – Feb 20, 2019

Subsystems (2)
lore
Share & tools
lore

Alexandre Belloni

author maintainer
#0 lore raw

PATCH 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.

Fixes 1eabdc2f9dd8 ("clk: at91: add at91sam9x5 PMCs driver")
Fixes a2038077de9a ("clk: at91: add sama5d2 PMC driver")
Fixes 084b696bb509 ("clk: at91: add sama5d4 pmc driver")
---
 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
index 2fe225a697df..d55a151cb7f5 100644
@@ -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
index d69ad96fe988..cd0ef7274fdb 100644
@@ -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
index e358be7f6c8d..b645a9d59cdb 100644
@@ -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
maintainer Acked-by on v1 1/1
#1 lore raw
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")
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
index 2fe225a697df..d55a151cb7f5 100644
@@ -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
index d69ad96fe988..cd0ef7274fdb 100644
@@ -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
index e358be7f6c8d..b645a9d59cdb 100644
@@ -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
#2 lore raw
Quoted 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")

+
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
index 2fe225a697df..d55a151cb7f5 100644
@@ -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
index d69ad96fe988..cd0ef7274fdb 100644
@@ -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
index e358be7f6c8d..b645a9d59cdb 100644
@@ -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
maintainer Applied
#3 lore raw
In reply to Alexandre Belloni

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")

---

Applied to clk-fixes