mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-27 14:28:05 +00:00
Koen Kooi
65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
From 7c76e002041cd5b084c9a8b6729ab33acf53643e Mon Sep 17 00:00:00 2001
|
|
From: Nishanth Menon <nm@ti.com>
|
|
Date: Wed, 25 May 2011 16:38:47 -0700
|
|
Subject: [PATCH 11/19] OMAP2+: cpufreq: deny initialization if no mpudev
|
|
|
|
if we do not have mpu_dev we normally fail in cpu_init. It is better
|
|
to fail driver registration if the devices are not available.
|
|
|
|
Signed-off-by: Nishanth Menon <nm@ti.com>
|
|
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
|
---
|
|
arch/arm/mach-omap2/omap2plus-cpufreq.c | 15 ++++++++-------
|
|
1 files changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c
|
|
index c46d0cd..33a91ec 100644
|
|
--- a/arch/arm/mach-omap2/omap2plus-cpufreq.c
|
|
+++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c
|
|
@@ -43,6 +43,7 @@
|
|
static struct cpufreq_frequency_table *freq_table;
|
|
static struct clk *mpu_clk;
|
|
static char *mpu_clk_name;
|
|
+static struct device *mpu_dev;
|
|
|
|
static int omap_verify_speed(struct cpufreq_policy *policy)
|
|
{
|
|
@@ -155,7 +156,6 @@ skip_lpj:
|
|
static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
|
|
{
|
|
int result = 0;
|
|
- struct device *mpu_dev;
|
|
static cpumask_var_t cpumask;
|
|
|
|
mpu_clk = clk_get(NULL, mpu_clk_name);
|
|
@@ -166,12 +166,6 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy)
|
|
return -EINVAL;
|
|
|
|
policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu);
|
|
- mpu_dev = omap2_get_mpuss_device();
|
|
-
|
|
- if (!mpu_dev) {
|
|
- pr_warning("%s: unable to get the mpu device\n", __func__);
|
|
- return -EINVAL;
|
|
- }
|
|
opp_init_cpufreq_table(mpu_dev, &freq_table);
|
|
|
|
if (freq_table) {
|
|
@@ -244,6 +238,13 @@ static int __init omap_cpufreq_init(void)
|
|
pr_err("%s: unsupported Silicon?\n", __func__);
|
|
return -EINVAL;
|
|
}
|
|
+
|
|
+ mpu_dev = omap2_get_mpuss_device();
|
|
+ if (!mpu_dev) {
|
|
+ pr_warning("%s: unable to get the mpu device\n", __func__);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
return cpufreq_register_driver(&omap_driver);
|
|
}
|
|
|
|
--
|
|
1.7.2.5
|
|
|