浏览代码

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>
Felipe Contreras 15 年之前
父节点
当前提交
d742709ea4
共有 4 个文件被更改,包括 6 次插入8 次删除
  1. 1 1
      arch/arm/mach-omap1/devices.c
  2. 2 2
      arch/arm/mach-omap1/mailbox.c
  3. 1 1
      arch/arm/mach-omap2/devices.c
  4. 2 4
      arch/arm/mach-omap2/mailbox.c

+ 1 - 1
arch/arm/mach-omap1/devices.c

@@ -87,7 +87,7 @@ static struct resource mbox_resources[] = {
 };
 };
 
 
 static struct platform_device mbox_device = {
 static struct platform_device mbox_device = {
-	.name		= "omap1-mailbox",
+	.name		= "omap-mailbox",
 	.id		= -1,
 	.id		= -1,
 	.num_resources	= ARRAY_SIZE(mbox_resources),
 	.num_resources	= ARRAY_SIZE(mbox_resources),
 	.resource	= mbox_resources,
 	.resource	= mbox_resources,

+ 2 - 2
arch/arm/mach-omap1/mailbox.c

@@ -1,5 +1,5 @@
 /*
 /*
- * Mailbox reservation modules for DSP
+ * Mailbox reservation modules for OMAP1
  *
  *
  * Copyright (C) 2006-2009 Nokia Corporation
  * Copyright (C) 2006-2009 Nokia Corporation
  * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
  * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
@@ -179,7 +179,7 @@ static struct platform_driver omap1_mbox_driver = {
 	.probe	= omap1_mbox_probe,
 	.probe	= omap1_mbox_probe,
 	.remove	= __devexit_p(omap1_mbox_remove),
 	.remove	= __devexit_p(omap1_mbox_remove),
 	.driver	= {
 	.driver	= {
-		.name	= "omap1-mailbox",
+		.name	= "omap-mailbox",
 	},
 	},
 };
 };
 
 

+ 1 - 1
arch/arm/mach-omap2/devices.c

@@ -209,7 +209,7 @@ static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources);
 #endif
 #endif
 
 
 static struct platform_device mbox_device = {
 static struct platform_device mbox_device = {
-	.name		= "omap2-mailbox",
+	.name		= "omap-mailbox",
 	.id		= -1,
 	.id		= -1,
 };
 };
 
 

+ 2 - 4
arch/arm/mach-omap2/mailbox.c

@@ -18,8 +18,6 @@
 #include <plat/mailbox.h>
 #include <plat/mailbox.h>
 #include <mach/irqs.h>
 #include <mach/irqs.h>
 
 
-#define DRV_NAME "omap2-mailbox"
-
 #define MAILBOX_REVISION		0x000
 #define MAILBOX_REVISION		0x000
 #define MAILBOX_SYSCONFIG		0x010
 #define MAILBOX_SYSCONFIG		0x010
 #define MAILBOX_SYSSTATUS		0x014
 #define MAILBOX_SYSSTATUS		0x014
@@ -451,7 +449,7 @@ static struct platform_driver omap2_mbox_driver = {
 	.probe = omap2_mbox_probe,
 	.probe = omap2_mbox_probe,
 	.remove = __devexit_p(omap2_mbox_remove),
 	.remove = __devexit_p(omap2_mbox_remove),
 	.driver = {
 	.driver = {
-		.name = DRV_NAME,
+		.name = "omap-mailbox",
 	},
 	},
 };
 };
 
 
@@ -472,4 +470,4 @@ MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("omap mailbox: omap2/3/4 architecture specific functions");
 MODULE_DESCRIPTION("omap mailbox: omap2/3/4 architecture specific functions");
 MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>");
 MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>");
 MODULE_AUTHOR("Paul Mundt");
 MODULE_AUTHOR("Paul Mundt");
-MODULE_ALIAS("platform:"DRV_NAME);
+MODULE_ALIAS("platform:omap2-mailbox");