From patchwork Wed Dec 30 12:30:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 70244 X-Patchwork-Delegate: paul@pwsan.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBUCUM1f011763 for ; Wed, 30 Dec 2009 12:30:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751900AbZL3MaW (ORCPT ); Wed, 30 Dec 2009 07:30:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751719AbZL3MaW (ORCPT ); Wed, 30 Dec 2009 07:30:22 -0500 Received: from ns1.siteground211.com ([209.62.36.12]:45026 "EHLO serv01.siteground211.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751395AbZL3MaV (ORCPT ); Wed, 30 Dec 2009 07:30:21 -0500 Received: from [91.154.126.168] (port=25776 helo=localhost.localdomain) by serv01.siteground211.com with esmtpa (Exim 4.69) (envelope-from ) id 1NPxgx-0004ma-Ci; Wed, 30 Dec 2009 06:30:19 -0600 From: Felipe Balbi To: paul@pwsan.com Cc: linux-omap@vger.kernel.org, Felipe Balbi Subject: [PATCH] arm: omap2: clk2xxx.c doesn't compile if CPUFREQ is enabled Date: Wed, 30 Dec 2009 14:30:13 +0200 Message-Id: <1262176213-16912-1-git-send-email-me@felipebalbi.com> X-Mailer: git-send-email 1.6.6.35.g1d85d In-Reply-To: <1261784154-18550-1-git-send-email-felipe.balbi@nokia.com> References: <1261784154-18550-1-git-send-email-felipe.balbi@nokia.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - serv01.siteground211.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - felipebalbi.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/clock2xxx.c b/arch/arm/mach-omap2/clock2xxx.c index d0e3fb7..4e2bdfe 100644 --- a/arch/arm/mach-omap2/clock2xxx.c +++ b/arch/arm/mach-omap2/clock2xxx.c @@ -455,12 +455,15 @@ static struct cpufreq_frequency_table freq_table[ARRAY_SIZE(rate_table)]; void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table) { struct prcm_config *prcm; + long rate; int i = 0; + rate = clk_get_rate(sclk); + for (prcm = rate_table; prcm->mpu_speed; prcm++) { if (!(prcm->flags & cpu_mask)) continue; - if (prcm->xtal_speed != sys_ck.rate) + if (prcm->xtal_speed != rate) continue; /* don't put bypass rates in table */