aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2010-06-11 11:51:48 -0400
committerHiroshi DOYU <Hiroshi.DOYU@nokia.com>2010-08-04 08:50:19 -0400
commitd742709ea4de70f4bf5e9b5171d37b92b5345ea3 (patch)
treef4c3f80bb19f8f586654a639e67c9ce0d36319a9 /arch
parent14476bd9373ed76858eaeb038eff8790ba36030e (diff)
omap: mailbox: standarize on 'omap-mailbox'
omap{1,2}-mailbox are modules that provide the 'omap-mailbox' driver. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/devices.c2
-rw-r--r--arch/arm/mach-omap1/mailbox.c4
-rw-r--r--arch/arm/mach-omap2/devices.c2
-rw-r--r--arch/arm/mach-omap2/mailbox.c6
4 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 314fea3074b5..16e43e52ce2f 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -87,7 +87,7 @@ static struct resource mbox_resources[] = {
87}; 87};
88 88
89static struct platform_device mbox_device = { 89static struct platform_device mbox_device = {
90 .name = "omap1-mailbox", 90 .name = "omap-mailbox",
91 .id = -1, 91 .id = -1,
92 .num_resources = ARRAY_SIZE(mbox_resources), 92 .num_resources = ARRAY_SIZE(mbox_resources),
93 .resource = mbox_resources, 93 .resource = mbox_resources,
diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
index 9ca0d58feadf..afc3963ddffe 100644
--- a/arch/arm/mach-omap1/mailbox.c
+++ b/arch/arm/mach-omap1/mailbox.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Mailbox reservation modules for DSP 2 * Mailbox reservation modules for OMAP1
3 * 3 *
4 * Copyright (C) 2006-2009 Nokia Corporation 4 * Copyright (C) 2006-2009 Nokia Corporation
5 * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com> 5 * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
@@ -179,7 +179,7 @@ static struct platform_driver omap1_mbox_driver = {
179 .probe = omap1_mbox_probe, 179 .probe = omap1_mbox_probe,
180 .remove = __devexit_p(omap1_mbox_remove), 180 .remove = __devexit_p(omap1_mbox_remove),
181 .driver = { 181 .driver = {
182 .name = "omap1-mailbox", 182 .name = "omap-mailbox",
183 }, 183 },
184}; 184};
185 185
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 56e60139c39d..44902405fb63 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -209,7 +209,7 @@ static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
209#endif 209#endif
210 210
211static struct platform_device mbox_device = { 211static struct platform_device mbox_device = {
212 .name = "omap2-mailbox", 212 .name = "omap-mailbox",
213 .id = -1, 213 .id = -1,
214}; 214};
215 215
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 4c0c1124e8c8..62d5ffe90100 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -18,8 +18,6 @@
18#include <plat/mailbox.h> 18#include <plat/mailbox.h>
19#include <mach/irqs.h> 19#include <mach/irqs.h>
20 20
21#define DRV_NAME "omap2-mailbox"
22
23#define MAILBOX_REVISION 0x000 21#define MAILBOX_REVISION 0x000
24#define MAILBOX_SYSCONFIG 0x010 22#define MAILBOX_SYSCONFIG 0x010
25#define MAILBOX_SYSSTATUS 0x014 23#define MAILBOX_SYSSTATUS 0x014
@@ -451,7 +449,7 @@ static struct platform_driver omap2_mbox_driver = {
451 .probe = omap2_mbox_probe, 449 .probe = omap2_mbox_probe,
452 .remove = __devexit_p(omap2_mbox_remove), 450 .remove = __devexit_p(omap2_mbox_remove),
453 .driver = { 451 .driver = {
454 .name = DRV_NAME, 452 .name = "omap-mailbox",
455 }, 453 },
456}; 454};
457 455
@@ -472,4 +470,4 @@ MODULE_LICENSE("GPL v2");
472MODULE_DESCRIPTION("omap mailbox: omap2/3/4 architecture specific functions"); 470MODULE_DESCRIPTION("omap mailbox: omap2/3/4 architecture specific functions");
473MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>"); 471MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>");
474MODULE_AUTHOR("Paul Mundt"); 472MODULE_AUTHOR("Paul Mundt");
475MODULE_ALIAS("platform:"DRV_NAME); 473MODULE_ALIAS("platform:omap2-mailbox");