From patchwork Sat Mar 5 14:09:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 612281 X-Patchwork-Delegate: khilman@deeprootsystems.com 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 p25E9a4i014982 for ; Sat, 5 Mar 2011 14:09:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752249Ab1CEOJa (ORCPT ); Sat, 5 Mar 2011 09:09:30 -0500 Received: from na3sys009aog112.obsmtp.com ([74.125.149.207]:47167 "EHLO na3sys009aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219Ab1CEOJa (ORCPT ); Sat, 5 Mar 2011 09:09:30 -0500 Received: from source ([209.85.213.181]) (using TLSv1) by na3sys009aob112.postini.com ([74.125.148.12]) with SMTP ID DSNKTXJEGG+65vdgMzncVCMUKPrdtYqkdWXq@postini.com; Sat, 05 Mar 2011 06:09:30 PST Received: by mail-yx0-f181.google.com with SMTP id 8so1309677yxm.26 for ; Sat, 05 Mar 2011 06:09:28 -0800 (PST) Received: by 10.150.164.18 with SMTP id m18mr2232458ybe.231.1299334168385; Sat, 05 Mar 2011 06:09:28 -0800 (PST) Received: from localhost (dragon.ti.com [192.94.94.33]) by mx.google.com with ESMTPS id 7sm324711yhl.45.2011.03.05.06.09.24 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Mar 2011 06:09:27 -0800 (PST) From: Nishanth Menon To: linux-omap Cc: Nishanth Menon , Paul , Tony , Kevin Subject: [PM-CORE RFC] OMAP2+: make CONFIG_PM selectable Date: Sat, 5 Mar 2011 19:39:18 +0530 Message-Id: <1299334158-26844-1-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.7.1 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]); Sat, 05 Mar 2011 14:09:37 +0000 (UTC) diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index b9d8a7b..1c99a01 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -7,8 +7,6 @@ config ARCH_OMAP2PLUS_TYPICAL default y select AEABI select REGULATOR - select PM - select PM_RUNTIME select VFP select NEON if ARCH_OMAP3 || ARCH_OMAP4 select SERIAL_OMAP diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 1d4d2ff..6d7f155 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -79,8 +79,7 @@ endif # PRCM obj-$(CONFIG_ARCH_OMAP2) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o -obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o \ - vc3xxx_data.o vp3xxx_data.o +obj-$(CONFIG_ARCH_OMAP3) += prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o obj-$(CONFIG_ARCH_OMAP4) += prcm.o cminst44xx.o cm44xx.o \ prcm_mpu44xx.o prminst44xx.o # XXX The presence of cm2xxx_3xxx.o on the line below is temporary and @@ -88,8 +87,12 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cminst44xx.o cm44xx.o \ # use OMAP4-specific PRCM functions. obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ cm44xx.o prcm_mpu44xx.o \ - prminst44xx.o vc44xx_data.o \ - vp44xx_data.o + prminst44xx.o + +ifeq ($(CONFIG_PM),y) +# OMAP Voltage h/w module specific +obj-$(CONFIG_ARCH_OMAP3) += vc3xxx_data.o vp3xxx_data.o +obj-$(CONFIG_ARCH_OMAP4) += vc44xx_data.o vp44xx_data.o # OMAP voltage domains voltagedomain-common := voltage.o @@ -98,6 +101,7 @@ obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) \ voltagedomains3xxx_data.o obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) \ voltagedomains44xx_data.o +endif # OMAP powerdomain framework powerdomain-common += powerdomain.o powerdomain-common.o