From: Omar Ramirez Luna <omar.ramirez@ti.com>
To: Tony Lindgren <tony@atomide.com>, Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Cc: Russell King <linux@arm.linux.org.uk>,
Felipe Contreras <felipe.contreras@gmail.com>,
Kevin Hilman <khilman@deeprootsystems.com>,
Omar Ramirez Luna <omar.ramirez@ti.com>,
Suman Anna <s-anna@ti.com>, Paul Walmsley <paul@pwsan.com>,
Benoit Cousson <b-cousson@ti.com>,
"Govindraj.R" <govindraj.raja@ti.com>,
Charulatha V <charu@ti.com>,
C A Subramaniam <subramaniam.ca@ti.com>,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/7] omap: mailbox: initial hwmod support
Date: Fri, 5 Nov 2010 19:17:21 -0600 [thread overview]
Message-ID: <1289006244-27147-5-git-send-email-omar.ramirez@ti.com> (raw)
In-Reply-To: <1289006244-27147-1-git-send-email-omar.ramirez@ti.com>
From: Felipe Contreras <felipe.contreras@gmail.com>
hwmod support for omap mailbox module.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Omar Ramirez Luna <omar.ramirez@ti.com>
---
arch/arm/mach-omap2/devices.c | 100 ++++++----------------------------------
1 files changed, 15 insertions(+), 85 deletions(-)
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index eaf3799..d977572 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -141,95 +141,25 @@ static inline void omap_init_camera(void)
#endif
#if defined(CONFIG_OMAP_MBOX_FWK) || defined(CONFIG_OMAP_MBOX_FWK_MODULE)
-
-#define MBOX_REG_SIZE 0x120
-
-#ifdef CONFIG_ARCH_OMAP2
-static struct resource omap2_mbox_resources[] = {
- {
- .start = OMAP24XX_MAILBOX_BASE,
- .end = OMAP24XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_24XX_MAIL_U0_MPU,
- .flags = IORESOURCE_IRQ,
- .name = "dsp",
- },
- {
- .start = INT_24XX_MAIL_U3_MPU,
- .flags = IORESOURCE_IRQ,
- .name = "iva",
- },
-};
-static int omap2_mbox_resources_sz = ARRAY_SIZE(omap2_mbox_resources);
-#else
-#define omap2_mbox_resources NULL
-#define omap2_mbox_resources_sz 0
-#endif
-
-#ifdef CONFIG_ARCH_OMAP3
-static struct resource omap3_mbox_resources[] = {
- {
- .start = OMAP34XX_MAILBOX_BASE,
- .end = OMAP34XX_MAILBOX_BASE + MBOX_REG_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = INT_24XX_MAIL_U0_MPU,
- .flags = IORESOURCE_IRQ,
- .name = "dsp",
- },
-};
-static int omap3_mbox_resources_sz = ARRAY_SIZE(omap3_mbox_resources);
-#else
-#define omap3_mbox_resources NULL
-#define omap3_mbox_resources_sz 0
-#endif
-
-#ifdef CONFIG_ARCH_OMAP4
-
-#define OMAP4_MBOX_REG_SIZE 0x130
-static struct resource omap4_mbox_resources[] = {
- {
- .start = OMAP44XX_MAILBOX_BASE,
- .end = OMAP44XX_MAILBOX_BASE +
- OMAP4_MBOX_REG_SIZE - 1,
- .flags = IORESOURCE_MEM,
- },
- {
- .start = OMAP44XX_IRQ_MAIL_U0,
- .flags = IORESOURCE_IRQ,
- .name = "mbox",
- },
-};
-static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
-#else
-#define omap4_mbox_resources NULL
-#define omap4_mbox_resources_sz 0
-#endif
-
-static struct platform_device mbox_device = {
- .name = "omap-mailbox",
- .id = -1,
-};
-
static inline void omap_init_mbox(void)
{
- if (cpu_is_omap24xx()) {
- mbox_device.resource = omap2_mbox_resources;
- mbox_device.num_resources = omap2_mbox_resources_sz;
- } else if (cpu_is_omap34xx()) {
- mbox_device.resource = omap3_mbox_resources;
- mbox_device.num_resources = omap3_mbox_resources_sz;
- } else if (cpu_is_omap44xx()) {
- mbox_device.resource = omap4_mbox_resources;
- mbox_device.num_resources = omap4_mbox_resources_sz;
- } else {
- pr_err("%s: platform not supported\n", __func__);
+ struct omap_hwmod *oh;
+ struct omap_device *od;
+
+ oh = omap_hwmod_lookup("mailbox");
+ if (!oh) {
+ pr_err("%s: unable to find hwmod\n", __func__);
+ return;
+ }
+
+ od = omap_device_build("omap-mailbox", -1, oh,
+ NULL, 0,
+ NULL, 0,
+ 0);
+ if (!od) {
+ pr_err("%s: could not build device\n", __func__);
return;
}
- platform_device_register(&mbox_device);
}
#else
static inline void omap_init_mbox(void) { }
--
1.7.1
next prev parent reply other threads:[~2010-11-06 1:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-06 1:17 [PATCH v2 0/7] omap: mailbox: hwmod support and dependent cleanup patches Omar Ramirez Luna
2010-11-06 1:17 ` [PATCH v2 1/7] OMAP2: hwmod data: add mailbox data Omar Ramirez Luna
2010-11-06 17:08 ` Cousson, Benoit
2010-11-07 14:27 ` Ramirez Luna, Omar
2010-11-06 1:17 ` [PATCH v2 2/7] OMAP3: " Omar Ramirez Luna
2010-11-06 1:17 ` [PATCH v2 3/7] OMAP4: " Omar Ramirez Luna
2010-11-06 17:18 ` Cousson, Benoit
2010-11-07 15:07 ` Ramirez Luna, Omar
2010-11-08 8:56 ` Cousson, Benoit
2010-11-08 16:55 ` Ramirez Luna, Omar
2010-11-06 1:17 ` Omar Ramirez Luna [this message]
2010-11-06 17:44 ` [PATCH v2 4/7] omap: mailbox: initial hwmod support Cousson, Benoit
2010-11-06 1:17 ` [PATCH v2 5/7] omap: mailbox: add omap_device latency information Omar Ramirez Luna
2010-11-06 18:09 ` Cousson, Benoit
2010-11-06 1:17 ` [PATCH v2 6/7] omap: mailbox: fix detection for previously supported chips Omar Ramirez Luna
2010-11-06 18:11 ` Cousson, Benoit
2010-11-07 15:15 ` Ramirez Luna, Omar
2010-11-07 21:05 ` Felipe Contreras
2010-11-08 16:05 ` Ramirez Luna, Omar
2010-11-08 21:43 ` Cousson, Benoit
2010-11-06 1:17 ` [PATCH v2 7/7] omap: mailbox: remove unreachable return Omar Ramirez Luna
2010-11-06 18:21 ` Cousson, Benoit
2010-11-07 15:18 ` Ramirez Luna, Omar
2010-11-06 18:32 ` [PATCH v2 0/7] omap: mailbox: hwmod support and dependent cleanup patches Cousson, Benoit
2010-11-07 15:19 ` Ramirez Luna, Omar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1289006244-27147-5-git-send-email-omar.ramirez@ti.com \
--to=omar.ramirez@ti.com \
--cc=Hiroshi.DOYU@nokia.com \
--cc=b-cousson@ti.com \
--cc=charu@ti.com \
--cc=felipe.contreras@gmail.com \
--cc=govindraj.raja@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=paul@pwsan.com \
--cc=s-anna@ti.com \
--cc=subramaniam.ca@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox