From patchwork Fri Sep 4 11:47:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "C.A, Subramaniam" X-Patchwork-Id: 45667 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 n84BkVe6029365 for ; Fri, 4 Sep 2009 11:47:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755888AbZIDLq5 (ORCPT ); Fri, 4 Sep 2009 07:46:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755882AbZIDLq5 (ORCPT ); Fri, 4 Sep 2009 07:46:57 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:59515 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755875AbZIDLq4 convert rfc822-to-8bit (ORCPT ); Fri, 4 Sep 2009 07:46:56 -0400 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n84BklbI005362; Fri, 4 Sep 2009 06:46:53 -0500 Received: from dbde71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id n84Bkl1f016135; Fri, 4 Sep 2009 17:16:47 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde71.ent.ti.com ([172.24.170.149]) with mapi; Fri, 4 Sep 2009 17:16:47 +0530 From: "C.A, Subramaniam" To: "linux-omap@vger.kernel.org" CC: "tony@atomide.com" , "Hiroshi.DOYU@nokia.com" , "rmk@arm.linux.org.uk" , "Kanigeri, Hari" , "Gupta, Ramesh" Date: Fri, 4 Sep 2009 17:17:43 +0530 Subject: [PATCH 2/10] omap mailbox: OMAP4 - Add resources and mailbox register base address for OMAP4 mailbox Thread-Topic: [PATCH 2/10] omap mailbox: OMAP4 - Add resources and mailbox register base address for OMAP4 mailbox Thread-Index: AcotVYM6xTOE7U4PT5CMOTqRoB4vAA== Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From 80e74ada510bace7208d59c0f912f9b1077efb45 Mon Sep 17 00:00:00 2001 From: C A Subramaniam Date: Wed, 2 Sep 2009 17:58:57 +0530 Subject: [PATCH 2/10] omap mailbox: OMAP4 - Add resources and mailbox register base address for OMAP4 mailbox This patch adds resource information of mailbox driver for OMAP4 mailbox module. Register base address also added Signed-off-by: C A Subramaniam Signed-off-by: Ramesh Gupta G --- arch/arm/mach-omap2/devices.c | 20 +++++++++++++++++++- arch/arm/plat-omap/include/mach/omap44xx.h | 2 ++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 894cc35..711ed6a 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -136,8 +136,11 @@ static inline void omap_init_camera(void) #if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE) +#ifdef CONFIG_ARCH_OMAP4 +#define MBOX_REG_SIZE 0x130 +#else #define MBOX_REG_SIZE 0x120 - +#endif static struct resource omap2_mbox_resources[] = { { .start = OMAP24XX_MAILBOX_BASE, @@ -166,6 +169,18 @@ static struct resource omap3_mbox_resources[] = { }, }; +static struct resource omap4_mbox_resources[] = { + { + .start = OMAP44xx_MAILBOX_BASE, + .end = OMAP44xx_MAILBOX_BASE + MBOX_REG_SIZE - 1, + .flags = IORESOURCE_MEM, + }, + { + .start = INT_44XX_MAIL_U0_MPU, + .flags = IORESOURCE_IRQ, + }, +}; + static struct platform_device mbox_device = { .name = "omap2-mailbox", .id = -1, @@ -179,6 +194,9 @@ static inline void omap_init_mbox(void) } else if (cpu_is_omap3430()) { mbox_device.num_resources = ARRAY_SIZE(omap3_mbox_resources); mbox_device.resource = omap3_mbox_resources; + } else if (cpu_is_omap44xx()) { + mbox_device.num_resources = ARRAY_SIZE(omap4_mbox_resources); + mbox_device.resource = omap4_mbox_resources; } else { pr_err("%s: platform not supported\n", __func__); return; diff --git a/arch/arm/plat-omap/include/mach/omap44xx.h b/arch/arm/plat-omap/include/mach/omap44xx.h index 52f2f85..6a545d3 100644 --- a/arch/arm/plat-omap/include/mach/omap44xx.h +++ b/arch/arm/plat-omap/include/mach/omap44xx.h @@ -44,5 +44,7 @@ #define OMAP44XX_WKUPGEN_BASE 0x48281000 #define OMAP44XX_VA_WKUPGEN_BASE IO_ADDRESS(OMAP44XX_WKUPGEN_BASE) +#define OMAP44xx_MAILBOX_BASE (L4_44XX_BASE + 0xF4000) + #endif /* __ASM_ARCH_OMAP44XX_H */