diff options
author | Felipe Contreras <felipe.contreras@gmail.com> | 2010-06-11 11:51:48 -0400 |
---|---|---|
committer | Hiroshi DOYU <Hiroshi.DOYU@nokia.com> | 2010-08-04 08:50:19 -0400 |
commit | d742709ea4de70f4bf5e9b5171d37b92b5345ea3 (patch) | |
tree | f4c3f80bb19f8f586654a639e67c9ce0d36319a9 /arch/arm/mach-omap2 | |
parent | 14476bd9373ed76858eaeb038eff8790ba36030e (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/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 6 |
2 files changed, 3 insertions, 5 deletions
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 | ||
211 | static struct platform_device mbox_device = { | 211 | static 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"); | |||
472 | MODULE_DESCRIPTION("omap mailbox: omap2/3/4 architecture specific functions"); | 470 | MODULE_DESCRIPTION("omap mailbox: omap2/3/4 architecture specific functions"); |
473 | MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>"); | 471 | MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>"); |
474 | MODULE_AUTHOR("Paul Mundt"); | 472 | MODULE_AUTHOR("Paul Mundt"); |
475 | MODULE_ALIAS("platform:"DRV_NAME); | 473 | MODULE_ALIAS("platform:omap2-mailbox"); |