1 files changed, 36 insertions, 0 deletions

diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c
index 41b09418f515..e7ccd21a45c9 100644
--- a/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
@@ -23,6 +23,7 @@
 #include <linux/list.h>
 #include <linux/of.h>
 #include <linux/bitops.h>
+#include <linux/pm.h>
 
 #include <asm/bug.h>
 #include <asm/signal.h>
@@ -48,6 +49,7 @@ struct brcmstb_gisb_arb_device {
         struct list_head next;
         u32 valid_mask;
         const char *master_names[sizeof(u32) * BITS_PER_BYTE];
+        u32 saved_timeout;
 };
 
 static LIST_HEAD(brcmstb_gisb_arb_device_list);
@@ -264,6 +266,39 @@ static int brcmstb_gisb_arb_probe(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int brcmstb_gisb_arb_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev);
+
+        gdev->saved_timeout = ioread32(gdev->base + ARB_TIMER);
+
+        return 0;
+}
+
+/* Make sure we provide the same timeout value that was configured before, and
+ * do this before the GISB timeout interrupt handler has any chance to run.
+ */
+static int brcmstb_gisb_arb_resume_noirq(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev);
+
+        iowrite32(gdev->saved_timeout, gdev->base + ARB_TIMER);
+
+        return 0;
+}
+#else
+#define brcmstb_gisb_arb_suspend       NULL
+#define brcmstb_gisb_arb_resume_noirq  NULL
+#endif
+
+static const struct dev_pm_ops brcmstb_gisb_arb_pm_ops = {
+        .suspend        = brcmstb_gisb_arb_suspend,
+        .resume_noirq   = brcmstb_gisb_arb_resume_noirq,
+};
+
 static const struct of_device_id brcmstb_gisb_arb_of_match[] = {
         { .compatible = "brcm,gisb-arb" },
         { },
@@ -275,6 +310,7 @@ static struct platform_driver brcmstb_gisb_arb_driver = {
                 .name   = "brcm-gisb-arb",
                 .owner  = THIS_MODULE,
                 .of_match_table = brcmstb_gisb_arb_of_match,
+                .pm     = &brcmstb_gisb_arb_pm_ops,
         },
 };