From patchwork Tue Nov 16 15:38:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 328402 X-Patchwork-Delegate: paul@pwsan.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 oAGFcLDH019000 for ; Tue, 16 Nov 2010 15:38:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753493Ab0KPPiU (ORCPT ); Tue, 16 Nov 2010 10:38:20 -0500 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 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id oAGFcEZr003072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 16 Nov 2010 09:38:16 -0600 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 oAGFc8Fb004750; Tue, 16 Nov 2010 21:08:08 +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 oAGFc7Pe005250; Tue, 16 Nov 2010 21:08:07 +0530 Received: (from a0131687@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id oAGFc7Hn005248; Tue, 16 Nov 2010 21:08:07 +0530 From: Rajendra Nayak To: linux-omap@vger.kernel.org Cc: paul@pwsan.com, b-cousson@ti.com, khilman@deeprootsystems.com, 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> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1289921886-5139-1-git-send-email-rnayak@ti.com> References: <1289921886-5139-1-git-send-email-rnayak@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 (demeter1.kernel.org [140.211.167.41]); Tue, 16 Nov 2010 15:38:22 +0000 (UTC) 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,