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 d925ef3d7d4841ba648bb0e74cff7dedda962dc7..fd5b8a5925cc5abaa3193066a26f9f35af1e53e4 100644 (file)
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -30,6 +30,9 @@
 #define MAILBOX_IRQ_NEWMSG(u)          (1 << (2 * (u)))
 #define MAILBOX_IRQ_NOTFULL(u)         (1 << (2 * (u) + 1))
 
+#define MBOX_REG_SIZE                  0x120
+#define MBOX_NR_REGS                   (MBOX_REG_SIZE / sizeof(u32))
+
 static void __iomem *mbox_base;
 
 struct omap_mbox2_fifo {
@@ -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;
@@ -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,
 };
 
 /*
@@ -231,7 +266,7 @@ static struct omap_mbox mbox_iva_info = {
 };
 #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;
@@ -254,7 +289,7 @@ static int __init omap2_mbox_probe(struct platform_device *pdev)
                goto err_dsp;
        }
 
-       ret = omap_mbox_register(&mbox_dsp_info);
+       ret = omap_mbox_register(&pdev->dev, &mbox_dsp_info);
        if (ret)
                goto err_dsp;
 
@@ -268,7 +303,7 @@ static int __init omap2_mbox_probe(struct platform_device *pdev)
                        goto err_iva1;
                }
                mbox_iva_info.irq = res->start;
-               ret = omap_mbox_register(&mbox_iva_info);
+               ret = omap_mbox_register(&pdev->dev, &mbox_iva_info);
                if (ret)
                        goto err_iva1;
        }
@@ -282,7 +317,7 @@ err_dsp:
        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);
@@ -294,9 +329,9 @@ static int omap2_mbox_remove(struct platform_device *pdev)
 
 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",
        },
 };
 
@@ -316,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");