From patchwork Wed Aug 12 14:27:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Nayak X-Patchwork-Id: 40876 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7CERs1u027265 for ; Wed, 12 Aug 2009 14:27:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752898AbZHLO1t (ORCPT ); Wed, 12 Aug 2009 10:27:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752981AbZHLO1t (ORCPT ); Wed, 12 Aug 2009 10:27:49 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:35436 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752898AbZHLO1s (ORCPT ); Wed, 12 Aug 2009 10:27:48 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n7CERb7E012930; Wed, 12 Aug 2009 09:27:43 -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 n7CERZkq013732; Wed, 12 Aug 2009 19:57:36 +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 n7CERZTi028739; Wed, 12 Aug 2009 19:57:35 +0530 Received: (from x0016154@localhost) by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id n7CERYxH028737; Wed, 12 Aug 2009 19:57:34 +0530 From: Rajendra Nayak To: linux-arm-kernel@lists.arm.linux.org.uk Cc: linux-omap@vger.kernel.org, Rajendra Nayak Subject: [PATCH v2 1/6] ARM: OMAP4: PM: Fix the PRM and CM base addresses Date: Wed, 12 Aug 2009 19:57:29 +0530 Message-Id: <1250087254-28653-1-git-send-email-rnayak@ti.com> X-Mailer: git-send-email 1.5.5 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This patch fixes the PRM and CM base addresses and adds a new CM2 base address for OMAP4 Signed-off-by: Rajendra Nayak --- arch/arm/mach-omap2/prcm.c | 2 ++ arch/arm/plat-omap/common.c | 2 ++ arch/arm/plat-omap/include/mach/common.h | 1 + arch/arm/plat-omap/include/mach/omap44xx.h | 6 ++++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index f945156..de307fa 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c @@ -27,6 +27,7 @@ static void __iomem *prm_base; static void __iomem *cm_base; +static void __iomem *cm2_base; u32 omap_prcm_get_reset_sources(void) { @@ -124,4 +125,5 @@ void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals) { prm_base = omap2_globals->prm; cm_base = omap2_globals->cm; + cm2_base = omap2_globals->cm2; } diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index ebcf006..e848a12 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -372,12 +372,14 @@ static struct omap_globals omap4_globals = { .ctrl = OMAP2_IO_ADDRESS(OMAP443X_CTRL_BASE), .prm = OMAP2_IO_ADDRESS(OMAP4430_PRM_BASE), .cm = OMAP2_IO_ADDRESS(OMAP4430_CM_BASE), + .cm2 = OMAP2_IO_ADDRESS(OMAP4430_CM2_BASE), }; void __init omap2_set_globals_443x(void) { omap2_set_globals_tap(&omap4_globals); omap2_set_globals_control(&omap4_globals); + omap2_set_globals_prcm(&omap4_globals); } #endif diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h index fdeab42..878c4f9 100644 --- a/arch/arm/plat-omap/include/mach/common.h +++ b/arch/arm/plat-omap/include/mach/common.h @@ -55,6 +55,7 @@ struct omap_globals { void __iomem *ctrl; /* System Control Module */ void __iomem *prm; /* Power and Reset Management */ void __iomem *cm; /* Clock Management */ + void __iomem *cm2; }; void omap2_set_globals_242x(void); diff --git a/arch/arm/plat-omap/include/mach/omap44xx.h b/arch/arm/plat-omap/include/mach/omap44xx.h index 15dec7f..b46b154 100644 --- a/arch/arm/plat-omap/include/mach/omap44xx.h +++ b/arch/arm/plat-omap/include/mach/omap44xx.h @@ -23,8 +23,10 @@ #define L4_EMU_44XX_BASE 0x54000000 #define L3_44XX_BASE 0x44000000 #define OMAP4430_32KSYNCT_BASE 0x4a304000 -#define OMAP4430_CM_BASE 0x4a004000 -#define OMAP4430_PRM_BASE 0x48306000 +#define OMAP4430_CM1_BASE 0x4a004000 +#define OMAP4430_CM_BASE OMAP4430_CM1_BASE +#define OMAP4430_CM2_BASE 0x4a008000 +#define OMAP4430_PRM_BASE 0x4a306000 #define OMAP44XX_GPMC_BASE 0x50000000 #define OMAP443X_SCM_BASE 0x4a002000 #define OMAP443X_CTRL_BASE OMAP443X_SCM_BASE