powerpc/85xx: Add lbc suspend support for PM

Power supply for LBC registers is off when system go to deep-sleep state.
We save the values of registers before suspend and restore to registers
after resume.

We removed the last two reservation arrays from struct fsl_lbc_regs for
allocating less memory and minimizing the memcpy size.

Signed-off-by: Jiang Yutang <b14898@freescale.com>
Signed-off-by: Jia Hongtao <B38951@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index 8a0b5ece8f76f8e6152bfe0a7be812426c06ce95..420b45368fcff05b5534a3f9bbcb396279bc1cb5 100644 (file)
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -238,8 +238,6 @@ struct fsl_lbc_regs {
 #define FPAR_LP_CI_SHIFT      0
        __be32 fbcr;            /**< Flash Byte Count Register */
 #define FBCR_BC      0x00000FFF
-       u8 res11[0x8];
-       u8 res8[0xF00];
 };
 
 /*
@@ -294,6 +292,11 @@ struct fsl_lbc_ctrl {
 
        /* status read from LTESR by irq handler */
        unsigned int                    irq_status;
+
+#ifdef CONFIG_SUSPEND
+       /* save regs when system go to deep-sleep */
+       struct fsl_lbc_regs             *saved_regs;
+#endif
 };
 
 extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base,

diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index d5c3c90ee6981a14d40da0175f3d3ddc0c0f77f4..483126d7b3c0f51dce66f6d73881f1888c7d8e40 100644 (file)
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -332,6 +332,38 @@ err:
        return ret;
 }
 
+#ifdef CONFIG_SUSPEND
+
+/* save lbc registers */
+static int fsl_lbc_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       struct fsl_lbc_ctrl *ctrl = dev_get_drvdata(&pdev->dev);
+       struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
+
+       ctrl->saved_regs = kmalloc(sizeof(struct fsl_lbc_regs), GFP_KERNEL);
+       if (!ctrl->saved_regs)
+               return -ENOMEM;
+
+       _memcpy_fromio(ctrl->saved_regs, lbc, sizeof(struct fsl_lbc_regs));
+       return 0;
+}
+
+/* restore lbc registers */
+static int fsl_lbc_resume(struct platform_device *pdev)
+{
+       struct fsl_lbc_ctrl *ctrl = dev_get_drvdata(&pdev->dev);
+       struct fsl_lbc_regs __iomem *lbc = ctrl->regs;
+
+       if (ctrl->saved_regs) {
+               _memcpy_toio(lbc, ctrl->saved_regs,
+                               sizeof(struct fsl_lbc_regs));
+               kfree(ctrl->saved_regs);
+               ctrl->saved_regs = NULL;
+       }
+       return 0;
+}
+#endif /* CONFIG_SUSPEND */
+
 static const struct of_device_id fsl_lbc_match[] = {
        { .compatible = "fsl,elbc", },
        { .compatible = "fsl,pq3-localbus", },
@@ -346,6 +378,10 @@ static struct platform_driver fsl_lbc_ctrl_driver = {
                .of_match_table = fsl_lbc_match,
        },
        .probe = fsl_lbc_ctrl_probe,
+#ifdef CONFIG_SUSPEND
+       .suspend     = fsl_lbc_suspend,
+       .resume      = fsl_lbc_resume,
+#endif
 };
 
 static int __init fsl_lbc_init(void)