Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d742709e authored by Felipe Contreras's avatar Felipe Contreras Committed by Hiroshi DOYU
Browse files

omap: mailbox: standarize on 'omap-mailbox' 



omap{1,2}-mailbox are modules that provide the 'omap-mailbox' driver.

Signed-off-by: default avatarFelipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
parent 14476bd9

arch/arm/mach-omap1/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static struct resource mbox_resources[] = { 
};



static struct platform_device mbox_device = {

	.name		= "omap1-mailbox",

	.name		= "omap-mailbox",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(mbox_resources),

	.resource	= mbox_resources,

arch/arm/mach-omap1/mailbox.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Mailbox reservation modules for DSP

 * Mailbox reservation modules for OMAP1

 *

 * Copyright (C) 2006-2009 Nokia Corporation

 * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
@@ -179,7 +179,7 @@ static struct platform_driver omap1_mbox_driver = { 
	.probe	= omap1_mbox_probe,

	.remove	= __devexit_p(omap1_mbox_remove),

	.driver	= {

		.name	= "omap1-mailbox",

		.name	= "omap-mailbox",

	},

};

arch/arm/mach-omap2/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int omap4_mbox_resources_sz = ARRAY_SIZE(omap4_mbox_resources); 
#endif



static struct platform_device mbox_device = {

	.name		= "omap2-mailbox",

	.name		= "omap-mailbox",

	.id		= -1,

};

arch/arm/mach-omap2/mailbox.c

+2 −4
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include <plat/mailbox.h>

#include <mach/irqs.h>



#define DRV_NAME "omap2-mailbox"



#define MAILBOX_REVISION		0x000

#define MAILBOX_SYSCONFIG		0x010

#define MAILBOX_SYSSTATUS		0x014
@@ -451,7 +449,7 @@ static struct platform_driver omap2_mbox_driver = { 
	.probe = omap2_mbox_probe,

	.remove = __devexit_p(omap2_mbox_remove),

	.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_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>");

MODULE_AUTHOR("Paul Mundt");

MODULE_ALIAS("platform:"DRV_NAME);
 
MODULE_ALIAS("platform:omap2-mailbox");