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

Commit f98d67a0 authored by Hiroshi DOYU's avatar Hiroshi DOYU Committed by Tony Lindgren
Browse files

omap mailbox: fix empty struct device for omap1 



Signed-off-by: default avatarHiroshi DOYU <Hiroshi.DOYU@nokia.com>
parent f48cca87

arch/arm/mach-omap1/devices.c

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

};





static struct platform_device mbox_device = {

static struct platform_device mbox_device = {

	.name		= "mailbox",

	.name		= "omap1-mailbox",

	.id		= -1,

	.id		= -1,

	.num_resources	= ARRAY_SIZE(mbox_resources),

	.num_resources	= ARRAY_SIZE(mbox_resources),

	.resource	= mbox_resources,

	.resource	= mbox_resources,

arch/arm/mach-omap1/mailbox.c

+15 −14
Original line number Original line Diff line number Diff line 
/*

/*

 * Mailbox reservation modules for DSP

 * Mailbox reservation modules for DSP

 *

 *

 * Copyright (C) 2006 Nokia Corporation

 * Copyright (C) 2006-2009 Nokia Corporation

 * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

 * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>

 *

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * This file is subject to the terms and conditions of the GNU General Public
@@ -27,7 +27,7 @@ 
#define MAILBOX_DSP2ARM1_Flag		0x1c

#define MAILBOX_DSP2ARM1_Flag		0x1c

#define MAILBOX_DSP2ARM2_Flag		0x20

#define MAILBOX_DSP2ARM2_Flag		0x20





unsigned long mbox_base;

static void __iomem *mbox_base;





struct omap_mbox1_fifo {

struct omap_mbox1_fifo {

	unsigned long cmd;

	unsigned long cmd;
@@ -40,14 +40,14 @@ struct omap_mbox1_priv { 
	struct omap_mbox1_fifo rx_fifo;

	struct omap_mbox1_fifo rx_fifo;

};

};





static inline int mbox_read_reg(unsigned int reg)

static inline int mbox_read_reg(size_t ofs)

{

{

	return __raw_readw(mbox_base + reg);

	return __raw_readw(mbox_base + ofs);

}

}





static inline void mbox_write_reg(unsigned int val, unsigned int reg)

static inline void mbox_write_reg(u32 val, size_t ofs)

{

{

	__raw_writew(val, mbox_base + reg);

	__raw_writew(val, mbox_base + ofs);

}

}





/* msg */

/* msg */
@@ -143,7 +143,7 @@ struct omap_mbox mbox_dsp_info = { 
};

};

EXPORT_SYMBOL(mbox_dsp_info);

EXPORT_SYMBOL(mbox_dsp_info);





static int __init omap1_mbox_probe(struct platform_device *pdev)

static int __devinit omap1_mbox_probe(struct platform_device *pdev)

{

{

	struct resource *res;

	struct resource *res;

	int ret = 0;

	int ret = 0;
@@ -170,12 +170,10 @@ static int __init omap1_mbox_probe(struct platform_device *pdev) 
	}

	}

	mbox_dsp_info.irq = res->start;

	mbox_dsp_info.irq = res->start;





	ret = omap_mbox_register(&mbox_dsp_info);

	return omap_mbox_register(&pdev->dev, &mbox_dsp_info);



	return ret;

}

}





static int omap1_mbox_remove(struct platform_device *pdev)

static int __devexit omap1_mbox_remove(struct platform_device *pdev)

{

{

	omap_mbox_unregister(&mbox_dsp_info);

	omap_mbox_unregister(&mbox_dsp_info);
@@ -184,9 +182,9 @@ static int omap1_mbox_remove(struct platform_device *pdev) 




static struct platform_driver omap1_mbox_driver = {

static struct platform_driver omap1_mbox_driver = {

	.probe	= omap1_mbox_probe,

	.probe	= omap1_mbox_probe,

	.remove	= omap1_mbox_remove,

	.remove	= __devexit_p(omap1_mbox_remove),

	.driver	= {

	.driver	= {

		.name	= "mailbox",

		.name	= "omap1-mailbox",

	},

	},

};

};
@@ -203,4 +201,7 @@ static void __exit omap1_mbox_exit(void) 
module_init(omap1_mbox_init);

module_init(omap1_mbox_init);

module_exit(omap1_mbox_exit);

module_exit(omap1_mbox_exit);





MODULE_LICENSE("GPL");
 
MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("omap mailbox: omap1 architecture specific functions");

MODULE_AUTHOR("Hiroshi DOYU" <Hiroshi.DOYU@nokia.com>);

MODULE_ALIAS("platform:omap1-mailbox");