Skip to contentSkip to conversation

OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4

PATCH New Jarkko Nikula 3 participants 3 messages Apr 14, 2011 – Apr 19, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/1 OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4

Fix this typo as there is no dpll_mpu_ck for OMAP3 and code flow is clearly trying to set mpu_clk for OMAP4 for which this dpll_mpu_ck is available.

Signed-off-by Jarkko Nikula <[email protected]>
---
 arch/arm/mach-omap2/omap2plus-cpufreq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/omap2plus-cpufreq.c +1 -1
index 8d472f6..d53ce23 100644
@@ -161,7 +161,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
 		mpu_clk = clk_get(NULL, "virt_prcm_set");
 	else if (cpu_is_omap34xx())
 		mpu_clk = clk_get(NULL, "dpll1_ck");
-	else if (cpu_is_omap34xx())
+	else if (cpu_is_omap44xx())
 		mpu_clk = clk_get(NULL, "dpll_mpu_ck");
 
 	if (IS_ERR(mpu_clk))
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4

Quoted 13 lines · Jarkko Nikula

Fix this typo as there is no dpll_mpu_ck for OMAP3 and code flow is clearly trying to set mpu_clk for OMAP4 for which this dpll_mpu_ck is available.

Signed-off-by Jarkko Nikula<[email protected]>
---
  arch/arm/mach-omap2/omap2plus-cpufreq.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/omap2plus-cpufreq.c +0 -0
index 8d472f6..d53ce23 100644

arch/arm/mach-omap2/omap2plus-cpufreq.c static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) · line 164

Quoted 5 lines
arch/arm/mach-omap2/omap2plus-cpufreq.c +1 -1
@@ -161,7 +161,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
  		mpu_clk = clk_get(NULL, "virt_prcm_set");
  	else if (cpu_is_omap34xx())
  		mpu_clk = clk_get(NULL, "dpll1_ck");
-	else if (cpu_is_omap34xx())
+	else if (cpu_is_omap44xx())

My Bad :(
Thanks Jarkko for finding this.

Acked-by Santosh Shilimkar <[email protected]>
Applied
#2 lore raw

PATCH 1/1 OMAP2PLUS: cpufreq: Fix typo when attempting to set mpu_clk for OMAP4

In reply to Jarkko Nikula
Quoted 4 lines · Jarkko Nikula

Fix this typo as there is no dpll_mpu_ck for OMAP3 and code flow is clearly trying to set mpu_clk for OMAP4 for which this dpll_mpu_ck is available.

Signed-off-by Jarkko Nikula <[email protected]>

Thanks, applied to pm-wip/cpufreq branch.

Kevin

Quoted 17 lines
---
 arch/arm/mach-omap2/omap2plus-cpufreq.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/omap2plus-cpufreq.c +1 -1
index 8d472f6..d53ce23 100644
@@ -161,7 +161,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
 		mpu_clk = clk_get(NULL, "virt_prcm_set");
 	else if (cpu_is_omap34xx())
 		mpu_clk = clk_get(NULL, "dpll1_ck");
-	else if (cpu_is_omap34xx())
+	else if (cpu_is_omap44xx())
 		mpu_clk = clk_get(NULL, "dpll_mpu_ck");
 
 	if (IS_ERR(mpu_clk))