From patchwork Sat May 1 17:38:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shishkin X-Patchwork-Id: 96295 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o41HfMwe030048 for ; Sat, 1 May 2010 17:41:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756799Ab0EARlY (ORCPT ); Sat, 1 May 2010 13:41:24 -0400 Received: from smtp.nokia.com ([192.100.105.134]:44780 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756345Ab0EARlW (ORCPT ); Sat, 1 May 2010 13:41:22 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx09.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o41Hf0HJ021635; Sat, 1 May 2010 12:41:17 -0500 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 1 May 2010 20:41:10 +0300 Received: from mgw-sa02.ext.nokia.com ([147.243.1.48]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Sat, 1 May 2010 20:41:10 +0300 Received: from trapdoor (esdhcp040182.research.nokia.com [172.21.40.182]) by mgw-sa02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o41Hf8oH030696 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Sat, 1 May 2010 20:41:08 +0300 Received: from ash by trapdoor with local (Exim 4.71) (envelope-from ) id 1O8GgX-0001Bs-Kt; Sat, 01 May 2010 20:41:01 +0300 From: virtuoso@slind.org To: tony@atomide.com Cc: linux-omap@vger.kernel.org, khilman@deeprootsystems.com, r-woodruff2@ti.com, Alexander Shishkin Subject: [PATCH 4/6] omap3: move EMU peripheral addresses to a platform header Date: Sat, 1 May 2010 20:38:19 +0300 Message-Id: <1272735501-2963-5-git-send-email-virtuoso@slind.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1272735501-2963-1-git-send-email-virtuoso@slind.org> References: <1272735501-2963-1-git-send-email-virtuoso@slind.org> X-OriginalArrivalTime: 01 May 2010 17:41:10.0375 (UTC) FILETIME=[7C803770:01CAE955] X-Nokia-AV: Clean 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]); Sat, 01 May 2010 17:41:27 +0000 (UTC) diff --git a/arch/arm/mach-omap2/emu.c b/arch/arm/mach-omap2/emu.c index 9c442e2..6b41745 100644 --- a/arch/arm/mach-omap2/emu.c +++ b/arch/arm/mach-omap2/emu.c @@ -24,19 +24,13 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Alexander Shishkin"); -/* Cortex CoreSight components within omap3xxx EMU */ -#define ETM_BASE (L4_EMU_34XX_PHYS + 0x10000) -#define DBG_BASE (L4_EMU_34XX_PHYS + 0x11000) -#define ETB_BASE (L4_EMU_34XX_PHYS + 0x1b000) -#define DAPCTL (L4_EMU_34XX_PHYS + 0x1d000) - static struct amba_device omap3_etb_device = { .dev = { .init_name = "etb", }, .res = { - .start = ETB_BASE, - .end = ETB_BASE + SZ_4K - 1, + .start = OMAP34XX_ETB_PHYS, + .end = OMAP34XX_ETB_PHYS + OMAP34XX_ETB_SIZE - 1, .flags = IORESOURCE_MEM, }, .periphid = 0x000bb907, @@ -47,8 +41,8 @@ static struct amba_device omap3_etm_device = { .init_name = "etm", }, .res = { - .start = ETM_BASE, - .end = ETM_BASE + SZ_4K - 1, + .start = OMAP34XX_ETM_PHYS, + .end = OMAP34XX_ETM_PHYS + OMAP34XX_ETM_SIZE - 1, .flags = IORESOURCE_MEM, }, .periphid = 0x102bb921, diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h index 128b549..81f736a 100644 --- a/arch/arm/plat-omap/include/plat/io.h +++ b/arch/arm/plat-omap/include/plat/io.h @@ -185,6 +185,26 @@ /* 3430 IVA - currently unmapped */ +#define OMAP34XX_DBG_OFFSET (0x00011000) +#define OMAP34XX_DBG_VIRT (L4_EMU_34XX_VIRT + OMAP34XX_DBG_OFFSET) +#define OMAP34XX_DBG_PHYS (L4_EMU_34XX_PHYS + OMAP34XX_DBG_OFFSET) +#define OMAP34XX_DBG_SIZE SZ_4K + +#define OMAP34XX_ETM_OFFSET (0x00010000) +#define OMAP34XX_ETM_VIRT (L4_EMU_34XX_VIRT + OMAP34XX_ETM_OFFSET) +#define OMAP34XX_ETM_PHYS (L4_EMU_34XX_PHYS + OMAP34XX_ETM_OFFSET) +#define OMAP34XX_ETM_SIZE SZ_4K + +#define OMAP34XX_ETB_OFFSET (0x0001b000) +#define OMAP34XX_ETB_VIRT (L4_EMU_34XX_VIRT + OMAP34XX_ETB_OFFSET) +#define OMAP34XX_ETB_PHYS (L4_EMU_34XX_PHYS + OMAP34XX_ETB_OFFSET) +#define OMAP34XX_ETB_SIZE SZ_4K + +#define OMAP34XX_DAP_OFFSET (0x0001d000) +#define OMAP34XX_DAP_VIRT (L4_EMU_34XX_VIRT + OMAP34XX_DAP_OFFSET) +#define OMAP34XX_DAP_PHYS (L4_EMU_34XX_PHYS + OMAP34XX_DAP_OFFSET) +#define OMAP34XX_DAP_SIZE SZ_4K + /* * ---------------------------------------------------------------------------- * Omap4 specific IO mapping