From patchwork Tue Jul 13 05:47:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thara Gopinath X-Patchwork-Id: 111664 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6D5lR1r014105 for ; Tue, 13 Jul 2010 05:47:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752095Ab0GMFrY (ORCPT ); Tue, 13 Jul 2010 01:47:24 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:44280 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751804Ab0GMFrV (ORCPT ); Tue, 13 Jul 2010 01:47:21 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o6D5lFAp010539 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 13 Jul 2010 00:47:17 -0500 Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o6D5l9a0013699; Tue, 13 Jul 2010 11:17:09 +0530 (IST) Received: from linfarm476.india.ti.com (localhost [127.0.0.1]) by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id o6D5l8CK024142; Tue, 13 Jul 2010 11:17:08 +0530 Received: (from a0393109@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o6D5l8e4024140; Tue, 13 Jul 2010 11:17:08 +0530 From: Thara Gopinath To: linux-omap@vger.kernel.org Cc: khilman@deeprootsystems.com, paul@pwsan.com, tony@atomide.com, b-cousson@ti.com, sawant@ti.com, vishwanath.bs@ti.com, premi@ti.com, Thara Gopinath Subject: [PM-OPP][PATCH 4/4] OMAP: Remove dependency of generic opp layer on cpufreq. Date: Tue, 13 Jul 2010 11:17:06 +0530 Message-Id: <1279000026-24042-5-git-send-email-thara@ti.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1279000026-24042-4-git-send-email-thara@ti.com> References: <1279000026-24042-1-git-send-email-thara@ti.com> <1279000026-24042-2-git-send-email-thara@ti.com> <1279000026-24042-3-git-send-email-thara@ti.com> <1279000026-24042-4-git-send-email-thara@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.3 (demeter.kernel.org [140.211.167.41]); Tue, 13 Jul 2010 05:47:27 +0000 (UTC) diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index faf831d..852fa33 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -13,7 +13,7 @@ obj- := obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o # OPP support in (OMAP3+ only at the moment) -ifdef CONFIG_CPU_FREQ +ifdef CONFIG_PM obj-$(CONFIG_ARCH_OMAP3) += opp.o obj-$(CONFIG_TWL4030_CORE) += opp_twl_tps.o endif @@ -37,4 +37,4 @@ obj-y += $(i2c-omap-m) $(i2c-omap-y) # OMAP mailbox framework obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o -obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o \ No newline at end of file +obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o diff --git a/arch/arm/plat-omap/include/plat/opp.h b/arch/arm/plat-omap/include/plat/opp.h index 29e3d03..7d3e0ef 100644 --- a/arch/arm/plat-omap/include/plat/opp.h +++ b/arch/arm/plat-omap/include/plat/opp.h @@ -60,7 +60,7 @@ struct omap_opp_def { struct omap_opp; -#ifdef CONFIG_CPU_FREQ +#ifdef CONFIG_PM unsigned long opp_get_voltage(const struct omap_opp *opp); @@ -155,5 +155,5 @@ void opp_init_cpufreq_table(struct omap_opp *opps, { } -#endif /* CONFIG_CPU_FREQ */ +#endif /* CONFIG_PM */ #endif /* __ASM_ARM_OMAP_OPP_H */