Merge branch 'v2.6.35-omap-mailbox-for-next' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus

Conflicts:
	arch/arm/mach-omap1/devices.c

1 files changed, 21 insertions, 34 deletions

diff --git a/arch/arm/mach-omap1/mailbox.c b/arch/arm/mach-omap1/mailbox.c
index 4f5b3da3d559..1a85a421007f 100644
--- a/arch/arm/mach-omap1/mailbox.c
+++ b/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
  * Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
@@ -9,13 +9,10 @@
  * for more details.
  */
 
-#include <linux/kernel.h>
-#include <linux/resource.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <plat/mailbox.h>
-#include <mach/irqs.h>
 
 #define MAILBOX_ARM2DSP1                0x00
 #define MAILBOX_ARM2DSP1b               0x04
@@ -83,7 +80,7 @@ static int omap1_mbox_fifo_full(struct omap_mbox *mbox)
         struct omap_mbox1_fifo *fifo =
                 &((struct omap_mbox1_priv *)mbox->priv)->rx_fifo;
 
-        return (mbox_read_reg(fifo->flag));
+        return mbox_read_reg(fifo->flag);
 }
 
 /* irq */
@@ -141,47 +138,37 @@ struct omap_mbox mbox_dsp_info = {
         .ops    = &omap1_mbox_ops,
         .priv   = &omap1_mbox_dsp_priv,
 };
-EXPORT_SYMBOL(mbox_dsp_info);
+
+struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info, NULL };
 
 static int __devinit omap1_mbox_probe(struct platform_device *pdev)
 {
-        struct resource *res;
+        struct resource *mem;
+        int ret;
+        int i;
+        struct omap_mbox **list;
 
-        if (pdev->num_resources != 2) {
-                dev_err(&pdev->dev, "invalid number of resources: %d\n",
-                        pdev->num_resources);
-                return -ENODEV;
-        }
+        list = omap1_mboxes;
+        list[0]->irq = platform_get_irq_byname(pdev, "dsp");
 
-        /* MBOX base */
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (unlikely(!res)) {
-                dev_err(&pdev->dev, "invalid mem resource\n");
-                return -ENODEV;
-        }
+        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        mbox_base = ioremap(mem->start, resource_size(mem));
+        if (!mbox_base)
+                return -ENOMEM;
 
-        mbox_base = ioremap(res->start, resource_size(res));
-        if (!mbox_base) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                return -ENODEV;
-        }
-
-        /* DSP IRQ */
-        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (unlikely(!res)) {
-                dev_err(&pdev->dev, "invalid irq resource\n");
+        ret = omap_mbox_register(&pdev->dev, list);
+        if (ret) {
                 iounmap(mbox_base);
-                return -ENODEV;
+                return ret;
         }
-        mbox_dsp_info.irq = res->start;
 
-        return omap_mbox_register(&pdev->dev, &mbox_dsp_info);
+        return 0;
 }
 
 static int __devexit omap1_mbox_remove(struct platform_device *pdev)
 {
-        omap_mbox_unregister(&mbox_dsp_info);
-
+        omap_mbox_unregister();
+        iounmap(mbox_base);
         return 0;
 }
 
@@ -189,7 +176,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",
         },
 };