From patchwork Fri May 13 21:07:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 783972 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4DL7fnR010583 for ; Fri, 13 May 2011 21:07:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759253Ab1EMVHx (ORCPT ); Fri, 13 May 2011 17:07:53 -0400 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]:56182 "EHLO na3sys009aog108.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759155Ab1EMVHw (ORCPT ); Fri, 13 May 2011 17:07:52 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTc2dpstLeUpkNl6f1GaxHjWflnbVG04O@postini.com; Fri, 13 May 2011 14:07:52 PDT Received: by mail-yx0-f173.google.com with SMTP id 8so1376718yxk.18 for ; Fri, 13 May 2011 14:07:50 -0700 (PDT) Received: by 10.236.80.101 with SMTP id j65mr1808882yhe.502.1305320870869; Fri, 13 May 2011 14:07:50 -0700 (PDT) Received: from localhost (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id 41sm1308617yha.64.2011.05.13.14.07.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 May 2011 14:07:50 -0700 (PDT) From: Nishanth Menon To: Kevin Hilman Cc: linux-omap , Nishanth Menon Subject: [PM-WIP-CPUFREQ][PATCH 4/5] OMAP2: cpufreq: use clk_init_cpufreq_table if OPPs not available Date: Fri, 13 May 2011 14:07:25 -0700 Message-Id: <1305320846-16147-5-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305320846-16147-1-git-send-email-nm@ti.com> References: <1305320846-16147-1-git-send-email-nm@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 13 May 2011 21:07:53 +0000 (UTC) OMAP2 does not use OPP tables at the moment for DVFS. Currently, we depend on opp table initialization to give us the freq_table, which makes sense for OMAP3+. for OMAP2, we should be using clk_init_cpufreq_table - so if the opp based frequency table initilization fails, fall back to clk_init_cpufreq_table to give us the table. Signed-off-by: Nishanth Menon --- arch/arm/mach-omap2/omap2plus-cpufreq.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/omap2plus-cpufreq.c b/arch/arm/mach-omap2/omap2plus-cpufreq.c index 45f1e9e..854f4b3 100644 --- a/arch/arm/mach-omap2/omap2plus-cpufreq.c +++ b/arch/arm/mach-omap2/omap2plus-cpufreq.c @@ -180,7 +180,13 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) pr_warning("%s: unable to get the mpu device\n", __func__); return -EINVAL; } - opp_init_cpufreq_table(mpu_dev, &freq_table); + + /* + * if we dont get cpufreq table using opp, use traditional omap2 lookup + * as a fallback + */ + if (opp_init_cpufreq_table(mpu_dev, &freq_table)) + clk_init_cpufreq_table(&freq_table); if (freq_table) { result = cpufreq_frequency_table_cpuinfo(policy, freq_table); @@ -188,6 +194,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) cpufreq_frequency_table_get_attr(freq_table, policy->cpu); } else { + clk_exit_cpufreq_table(&freq_table); WARN(true, "%s: fallback to clk_round(freq_table=%d)\n", __func__, result); kfree(freq_table);