From patchwork Wed Dec 9 06:17:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 65886 X-Patchwork-Delegate: paul@pwsan.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 nB96Hon1003474 for ; Wed, 9 Dec 2009 06:17:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755486AbZLIGRd (ORCPT ); Wed, 9 Dec 2009 01:17:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755895AbZLIGRc (ORCPT ); Wed, 9 Dec 2009 01:17:32 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:59788 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755683AbZLIGRY (ORCPT ); Wed, 9 Dec 2009 01:17:24 -0500 Received: from dlep36.itg.ti.com ([157.170.170.91]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id nB96HQR4022485 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 9 Dec 2009 00:17:26 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id nB96HQlA010064; Wed, 9 Dec 2009 00:17:26 -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 nB96HPZ06348; Wed, 9 Dec 2009 00:17:25 -0600 (CST) Received: by senorita (Postfix, from userid 1000) id CAA03C1F2; Wed, 9 Dec 2009 00:17:23 -0600 (CST) From: Nishanth Menon To: Kevin Hilman Cc: linux-omap , Nishanth Menon , Benoit Cousson , Eduardo Valentin , Kevin Hilman , Madhusudhan Chikkature Rajashekar , Paul Walmsley , Romit Dasgupta , Sanjeev Premi , Santosh Shilimkar , Sergio Alberto Aguirre Rodriguez , Tero Kristo , Thara Gopinath , Vishwanath Sripathy Subject: [PATCH 07/10 V4] omap3: clk: use pm accessor functions for cpufreq table Date: Wed, 9 Dec 2009 00:17:12 -0600 Message-Id: <1260339435-20294-8-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1260339435-20294-7-git-send-email-nm@ti.com> References: <1260339435-20294-1-git-send-email-nm@ti.com> <1260339435-20294-2-git-send-email-nm@ti.com> <1260339435-20294-3-git-send-email-nm@ti.com> <1260339435-20294-4-git-send-email-nm@ti.com> <1260339435-20294-5-git-send-email-nm@ti.com> <1260339435-20294-6-git-send-email-nm@ti.com> <1260339435-20294-7-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 5150939..6c4a609 100644 --- a/arch/arm/mach-omap2/clock34xx.c +++ b/arch/arm/mach-omap2/clock34xx.c @@ -1042,30 +1042,44 @@ 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]; + +static struct cpufreq_frequency_table *freq_table; void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) { - struct omap_opp *prcm; int i = 0; + int opp_num; + struct omap_opp *opp = mpu_opps; + unsigned long freq = ULONG_MAX; - if (!mpu_opps) + if (!mpu_opps) { + pr_warning("%s: failed to initialize frequency" + "table\n", __func__); + return; + } + opp_num = opp_get_opp_count(mpu_opps); + if (opp_num < 0) { + pr_err("%s: no opp table?\n", __func__); return; - - prcm = mpu_opps + MAX_VDD1_OPP; - for (; prcm->rate; prcm--) { - freq_table[i].index = i; - freq_table[i].frequency = prcm->rate / 1000; - i++; } - if (i == 0) { - printk(KERN_WARNING "%s: failed to initialize frequency \ - table\n", - __func__); + freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) * + (opp_num + 1), GFP_ATOMIC); + if (!freq_table) { + pr_warning("%s: failed to allocate frequency" + "table\n", __func__); return; } + while (!IS_ERR(opp = opp_find_freq_approx(opp, &freq, + OPP_SEARCH_LOW))) { + freq_table[i].index = i; + freq_table[i].frequency = freq / 1000; + i++; + /* set the next benchmark to search */ + freq--; + } + freq_table[i].index = i; freq_table[i].frequency = CPUFREQ_TABLE_END;