From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rajendra Nayak Subject: [PATCH 1/6] OMAP: powerdomain: Move powerdomain.c from mach-omap2 to plat-omap Date: Tue, 16 Nov 2010 21:08:01 +0530 Message-ID: <1289921886-5139-2-git-send-email-rnayak@ti.com> References: <1289921886-5139-1-git-send-email-rnayak@ti.com> Return-path: Received: from comal.ext.ti.com ([198.47.26.152]:45833 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751814Ab0KPPiT (ORCPT ); Tue, 16 Nov 2010 10:38:19 -0500 In-Reply-To: <1289921886-5139-1-git-send-email-rnayak@ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: linux-omap@vger.kernel.org Cc: paul@pwsan.com, b-cousson@ti.com, khilman@deeprootsystems.com, Rajendra Nayak This is in preparation of splitting the powerdomain framework into platform-independent part (for all omaps) and platform-specific parts. The platform-independent code would reside in plat-omap/powerdomain.c and the platform-specific code will resides in mach-omap2/powerdomain-xxxx.c files. Some of the hacks to include header files are done to make sure the patch compiles and works fine. These hacks will be removed in the subsequent patches. Signed-off-by: Rajendra Nayak Cc: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman --- arch/arm/mach-omap2/Makefile | 2 +- arch/arm/plat-omap/Makefile | 6 +++--- arch/arm/{mach-omap2 => plat-omap}/powerdomain.c | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) rename arch/arm/{mach-omap2 => plat-omap}/powerdomain.c (99%) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 60e51bc..4bfadc5 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -9,7 +9,7 @@ obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \ omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o hwmod-common = omap_hwmod.o \ omap_hwmod_common_data.o -prcm-common = prcm.o powerdomain.o +prcm-common = prcm.o clock-common = clock.o clock_common_data.o \ clockdomain.o clkt_dpll.o \ clkt_clksel.o diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index a4a1285..424a9ae 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -13,9 +13,9 @@ obj- := obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o # omap_device support (OMAP2+ only at the moment) -obj-$(CONFIG_ARCH_OMAP2) += omap_device.o -obj-$(CONFIG_ARCH_OMAP3) += omap_device.o -obj-$(CONFIG_ARCH_OMAP4) += omap_device.o +obj-$(CONFIG_ARCH_OMAP2) += omap_device.o powerdomain.o +obj-$(CONFIG_ARCH_OMAP3) += omap_device.o powerdomain.o +obj-$(CONFIG_ARCH_OMAP4) += omap_device.o powerdomain.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o obj-$(CONFIG_OMAP_IOMMU) += iommu.o iovmm.o diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/plat-omap/powerdomain.c similarity index 99% rename from arch/arm/mach-omap2/powerdomain.c rename to arch/arm/plat-omap/powerdomain.c index 6527ec3..9204799 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/plat-omap/powerdomain.c @@ -26,19 +26,19 @@ #include -#include "cm.h" -#include "cm-regbits-34xx.h" -#include "cm-regbits-44xx.h" -#include "prm.h" -#include "prm-regbits-34xx.h" -#include "prm-regbits-44xx.h" +#include "../mach-omap2/cm.h" +#include "../mach-omap2/cm-regbits-34xx.h" +#include "../mach-omap2/cm-regbits-44xx.h" +#include "../mach-omap2/prm.h" +#include "../mach-omap2/prm-regbits-34xx.h" +#include "../mach-omap2/prm-regbits-44xx.h" #include #include #include #include -#include "pm.h" +#include "../mach-omap2/pm.h" enum { PWRDM_STATE_NOW = 0, -- 1.7.0.4