From patchwork Thu Nov 12 05:45:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 59503 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAC5jxuB016152 for ; Thu, 12 Nov 2009 05:45:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932167AbZKLFpw (ORCPT ); Thu, 12 Nov 2009 00:45:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753330AbZKLFpv (ORCPT ); Thu, 12 Nov 2009 00:45:51 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:52523 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753261AbZKLFpq (ORCPT ); Thu, 12 Nov 2009 00:45:46 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id nAC5joTc013981 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 11 Nov 2009 23:45:50 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id nAC5jiSI013361; Wed, 11 Nov 2009 23:45:44 -0600 (CST) Received: from senorita (senorita.am.dhcp.ti.com [128.247.75.1]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id nAC5jiZ25582; Wed, 11 Nov 2009 23:45:44 -0600 (CST) Received: by senorita (Postfix, from userid 1000) id 378E2C1DA; Wed, 11 Nov 2009 23:45:43 -0600 (CST) From: Nishanth Menon To: linux-omap Cc: Nishanth Menon , Benoit Cousson , Kevin Hilman , Madhusudhan Chikkature Rajashekar , Paul Walmsley , Romit Dasgupta , Sanjeev Premi , Santosh Shilimkar , Sergio Alberto Aguirre Rodriguez , Thara Gopinath , Vishwanath Sripathy Subject: [PATCH 6/9] omap3: clk: use pm accessor functions for cpufreq table Date: Wed, 11 Nov 2009 23:45:18 -0600 Message-Id: <1258004721-7315-7-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1258004721-7315-6-git-send-email-nm@ti.com> References: <1258004721-7315-1-git-send-email-nm@ti.com> <1258004721-7315-2-git-send-email-nm@ti.com> <1258004721-7315-3-git-send-email-nm@ti.com> <1258004721-7315-4-git-send-email-nm@ti.com> <1258004721-7315-5-git-send-email-nm@ti.com> <1258004721-7315-6-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 diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index da5bc1f..daec6ea 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -1042,28 +1042,46 @@ static unsigned long omap3_clkoutx2_recalc(struct clk *clk) #if defined(CONFIG_ARCH_OMAP3) #ifdef CONFIG_CPU_FREQ -static struct cpufreq_frequency_table freq_table[MAX_VDD1_OPP+1]; + +/* Use a dummy table with no entries to start with */ +static struct cpufreq_frequency_table dummy_freq_table = { + .frequency = CPUFREQ_TABLE_END, +}; +static struct cpufreq_frequency_table *freq_table = &dummy_freq_table; void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) { - struct omap_opp *prcm; - int i = 0; + int i; + int ret; + u8 opp_id; + unsigned long freq; if (!mpu_opps) return; - - prcm = mpu_opps + MAX_VDD1_OPP; - for (; prcm->rate; prcm--) { - freq_table[i].index = i; - freq_table[i].frequency = prcm->rate / 1000; - i++; + ret = get_limit_freq(&freq, mpu_opps, true, true); + if (ret) { + pr_warning("%s: failed to initialize frequency" + "table\n", __func__); + return; } + /* The following should'nt fail */ + BUG_ON(freq_to_opp(&opp_id, mpu_opps, freq)); - if (i == 0) { - printk(KERN_WARNING "%s: failed to initialize frequency \ - table\n", - __func__); - return; + /* There is a risk of overallocating if the lower/intermediate + * OPPs are disabled, but the amount is not expected to be high + * in comparison to reallocating to exactly available opps + */ + freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * + (opp_id + 1), GFP_KERNEL); + + /* Populate the first index.. we already found the freq */ + freq_table[0].index = 0; + freq_table[0].frequency = freq / 1000; + + /* Populate the table highest to lowest */ + for (i = 1; !get_next_freq(&freq, mpu_opps, false, true, true); i++) { + freq_table[i].index = i; + freq_table[i].frequency = freq / 1000; } freq_table[i].index = i;