1 files changed, 35 insertions, 0 deletions

diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c
index fb0b124b35f..0d64e2d7474 100644
--- a/drivers/media/video/marvell-ccic/mmp-driver.c
+++ b/drivers/media/video/marvell-ccic/mmp-driver.c
@@ -26,6 +26,7 @@
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/list.h>
+#include <linux/pm.h>
 
 #include "mcam-core.h"
 
@@ -310,10 +311,44 @@ static int mmpcam_platform_remove(struct platform_device *pdev)
         return mmpcam_remove(cam);
 }
 
+/*
+ * Suspend/resume support.
+ */
+#ifdef CONFIG_PM
+
+static int mmpcam_suspend(struct platform_device *pdev, pm_message_t state)
+{
+        struct mmp_camera *cam = mmpcam_find_device(pdev);
+
+        if (state.event != PM_EVENT_SUSPEND)
+                return 0;
+        mccic_suspend(&cam->mcam);
+        return 0;
+}
+
+static int mmpcam_resume(struct platform_device *pdev)
+{
+        struct mmp_camera *cam = mmpcam_find_device(pdev);
+
+        /*
+         * Power up unconditionally just in case the core tries to
+         * touch a register even if nothing was active before; trust
+         * me, it's better this way.
+         */
+        mmpcam_power_up(&cam->mcam);
+        return mccic_resume(&cam->mcam);
+}
+
+#endif
+
 
 static struct platform_driver mmpcam_driver = {
         .probe          = mmpcam_probe,
         .remove         = mmpcam_platform_remove,
+#ifdef CONFIG_PM
+        .suspend        = mmpcam_suspend,
+        .resume         = mmpcam_resume,
+#endif
         .driver = {
                 .name   = "mmp-camera",
                 .owner  = THIS_MODULE