Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / mailbox.c

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 4487a4de52f3adb68813374a1406388357ce9f98..fd5b8a5925cc5abaa3193066a26f9f35af1e53e4 100644 (file)
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -30,7 +30,10 @@
 #define MAILBOX_IRQ_NEWMSG(u)          (1 << (2 * (u)))
 #define MAILBOX_IRQ_NOTFULL(u)         (1 << (2 * (u) + 1))
 
-static unsigned long mbox_base;
+#define MBOX_REG_SIZE                  0x120
+#define MBOX_NR_REGS                   (MBOX_REG_SIZE / sizeof(u32))
+
+static void __iomem *mbox_base;
 
 struct omap_mbox2_fifo {
        unsigned long msg;
@@ -45,6 +48,7 @@ struct omap_mbox2_priv {
        unsigned long irqstatus;
        u32 newmsg_bit;
        u32 notfull_bit;
+       u32 ctx[MBOX_NR_REGS];
 };
 
 static struct clk *mbox_ick_handle;
@@ -52,14 +56,14 @@ static struct clk *mbox_ick_handle;
 static void omap2_mbox_enable_irq(struct omap_mbox *mbox,
                                  omap_mbox_type_t irq);
 
-static inline unsigned int mbox_read_reg(unsigned int reg)
+static inline unsigned int mbox_read_reg(size_t ofs)
 {
-       return __raw_readl(mbox_base + reg);
+       return __raw_readl(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_writel(val, mbox_base + reg);
+       __raw_writel(val, mbox_base + ofs);
 }
 
 /* Mailbox H/W preparations */
@@ -74,6 +78,9 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
        }
        clk_enable(mbox_ick_handle);
 
+       l = mbox_read_reg(MAILBOX_REVISION);
+       pr_info("omap mailbox rev %d.%d\n", (l & 0xf0) >> 4, (l & 0x0f));
+
        /* set smart-idle & autoidle */
        l = mbox_read_reg(MAILBOX_SYSCONFIG);
        l |= 0x00000011;
@@ -162,6 +169,32 @@ static int omap2_mbox_is_irq(struct omap_mbox *mbox,
        return (enable & status & bit);
 }
 
+static void omap2_mbox_save_ctx(struct omap_mbox *mbox)
+{
+       int i;
+       struct omap_mbox2_priv *p = mbox->priv;
+
+       for (i = 0; i < MBOX_NR_REGS; i++) {
+               p->ctx[i] = mbox_read_reg(i * sizeof(u32));
+
+               dev_dbg(mbox->dev, "%s: [%02x] %08x\n", __func__,
+                       i, p->ctx[i]);
+       }
+}
+
+static void omap2_mbox_restore_ctx(struct omap_mbox *mbox)
+{
+       int i;
+       struct omap_mbox2_priv *p = mbox->priv;
+
+       for (i = 0; i < MBOX_NR_REGS; i++) {
+               mbox_write_reg(p->ctx[i], i * sizeof(u32));
+
+               dev_dbg(mbox->dev, "%s: [%02x] %08x\n", __func__,
+                       i, p->ctx[i]);
+       }
+}
+
 static struct omap_mbox_ops omap2_mbox_ops = {
        .type           = OMAP_MBOX_TYPE2,
        .startup        = omap2_mbox_startup,
@@ -174,6 +207,8 @@ static struct omap_mbox_ops omap2_mbox_ops = {
        .disable_irq    = omap2_mbox_disable_irq,
        .ack_irq        = omap2_mbox_ack_irq,
        .is_irq         = omap2_mbox_is_irq,
+       .save_ctx       = omap2_mbox_save_ctx,
+       .restore_ctx    = omap2_mbox_restore_ctx,
 };
 
 /*
@@ -208,7 +243,7 @@ struct omap_mbox mbox_dsp_info = {
 };
 EXPORT_SYMBOL(mbox_dsp_info);
 
-/* IVA */
+#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
 static struct omap_mbox2_priv omap2_mbox_iva_priv = {
        .tx_fifo = {
                .msg            = MAILBOX_MESSAGE(2),
@@ -229,17 +264,12 @@ static struct omap_mbox mbox_iva_info = {
        .ops    = &omap2_mbox_ops,
        .priv   = &omap2_mbox_iva_priv,
 };
+#endif
 
-static int __init omap2_mbox_probe(struct platform_device *pdev)
+static int __devinit omap2_mbox_probe(struct platform_device *pdev)
 {
        struct resource *res;
-       int ret = 0;
-
-       if (pdev->num_resources != 3) {
-               dev_err(&pdev->dev, "invalid number of resources: %d\n",
-                       pdev->num_resources);
-               return -ENODEV;
-       }
+       int ret;
 
        /* MBOX base */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -247,42 +277,61 @@ static int __init omap2_mbox_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "invalid mem resource\n");
                return -ENODEV;
        }
-       mbox_base = res->start;
+       mbox_base = ioremap(res->start, res->end - res->start);
+       if (!mbox_base)
+               return -ENOMEM;
 
-       /* DSP IRQ */
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (unlikely(!res)) {
+       /* DSP or IVA2 IRQ */
+       mbox_dsp_info.irq = platform_get_irq(pdev, 0);
+       if (mbox_dsp_info.irq < 0) {
                dev_err(&pdev->dev, "invalid irq resource\n");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto err_dsp;
        }
-       mbox_dsp_info.irq = res->start;
-
-       ret = omap_mbox_register(&mbox_dsp_info);
 
-       /* IVA IRQ */
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
-       if (unlikely(!res)) {
-               dev_err(&pdev->dev, "invalid irq resource\n");
-               return -ENODEV;
+       ret = omap_mbox_register(&pdev->dev, &mbox_dsp_info);
+       if (ret)
+               goto err_dsp;
+
+#if defined(CONFIG_ARCH_OMAP2420) /* IVA */
+       if (cpu_is_omap2420()) {
+               /* IVA IRQ */
+               res = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
+               if (unlikely(!res)) {
+                       dev_err(&pdev->dev, "invalid irq resource\n");
+                       ret = -ENODEV;
+                       goto err_iva1;
+               }
+               mbox_iva_info.irq = res->start;
+               ret = omap_mbox_register(&pdev->dev, &mbox_iva_info);
+               if (ret)
+                       goto err_iva1;
        }
-       mbox_iva_info.irq = res->start;
-
-       ret = omap_mbox_register(&mbox_iva_info);
+#endif
+       return 0;
 
+err_iva1:
+       omap_mbox_unregister(&mbox_dsp_info);
+err_dsp:
+       iounmap(mbox_base);
        return ret;
 }
 
-static int omap2_mbox_remove(struct platform_device *pdev)
+static int __devexit omap2_mbox_remove(struct platform_device *pdev)
 {
+#if defined(CONFIG_ARCH_OMAP2420)
+       omap_mbox_unregister(&mbox_iva_info);
+#endif
        omap_mbox_unregister(&mbox_dsp_info);
+       iounmap(mbox_base);
        return 0;
 }
 
 static struct platform_driver omap2_mbox_driver = {
        .probe = omap2_mbox_probe,
-       .remove = omap2_mbox_remove,
+       .remove = __devexit_p(omap2_mbox_remove),
        .driver = {
-               .name = "mailbox",
+               .name = "omap2-mailbox",
        },
 };
 
@@ -302,3 +351,4 @@ module_exit(omap2_mbox_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("omap mailbox: omap2/3 architecture specific functions");
 MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>, Paul Mundt");
+MODULE_ALIAS("platform:omap2-mailbox");