pinctrl: constify of_device_id array

[mirror_ubuntu-zesty-kernel.git] / drivers / pinctrl / mvebu / pinctrl-armada-xp.c

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
index fc3376147c189962d30e4cd7aaf6a6246161f10e..578db9f033b23c001257d94fe90c39a9c20ca9f1 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-xp.c
@@ -34,6 +34,7 @@
 #include "pinctrl-mvebu.h"
 
 static void __iomem *mpp_base;
+static u32 *mpp_saved_regs;
 
 static int armada_xp_mpp_ctrl_get(unsigned pid, unsigned long *config)
 {
@@ -361,7 +362,7 @@ static struct mvebu_mpp_mode armada_xp_mpp_modes[] = {
 
 static struct mvebu_pinctrl_soc_info armada_xp_pinctrl_info;
 
-static struct of_device_id armada_xp_pinctrl_of_match[] = {
+static const struct of_device_id armada_xp_pinctrl_of_match[] = {
        {
                .compatible = "marvell,mv78230-pinctrl",
                .data       = (void *) V_MV78230,
@@ -406,12 +407,42 @@ static struct pinctrl_gpio_range mv78460_mpp_gpio_ranges[] = {
        MPP_GPIO_RANGE(2,  64, 64,  3),
 };
 
+static int armada_xp_pinctrl_suspend(struct platform_device *pdev,
+                                    pm_message_t state)
+{
+       struct mvebu_pinctrl_soc_info *soc =
+               platform_get_drvdata(pdev);
+       int i, nregs;
+
+       nregs = DIV_ROUND_UP(soc->nmodes, MVEBU_MPPS_PER_REG);
+
+       for (i = 0; i < nregs; i++)
+               mpp_saved_regs[i] = readl(mpp_base + i * 4);
+
+       return 0;
+}
+
+static int armada_xp_pinctrl_resume(struct platform_device *pdev)
+{
+       struct mvebu_pinctrl_soc_info *soc =
+               platform_get_drvdata(pdev);
+       int i, nregs;
+
+       nregs = DIV_ROUND_UP(soc->nmodes, MVEBU_MPPS_PER_REG);
+
+       for (i = 0; i < nregs; i++)
+               writel(mpp_saved_regs[i], mpp_base + i * 4);
+
+       return 0;
+}
+
 static int armada_xp_pinctrl_probe(struct platform_device *pdev)
 {
        struct mvebu_pinctrl_soc_info *soc = &armada_xp_pinctrl_info;
        const struct of_device_id *match =
                of_match_device(armada_xp_pinctrl_of_match, &pdev->dev);
        struct resource *res;
+       int nregs;
 
        if (!match)
                return -ENODEV;
@@ -459,6 +490,13 @@ static int armada_xp_pinctrl_probe(struct platform_device *pdev)
                break;
        }
 
+       nregs = DIV_ROUND_UP(soc->nmodes, MVEBU_MPPS_PER_REG);
+
+       mpp_saved_regs = devm_kmalloc(&pdev->dev, nregs * sizeof(u32),
+                                     GFP_KERNEL);
+       if (!mpp_saved_regs)
+               return -ENOMEM;
+
        pdev->dev.platform_data = soc;
 
        return mvebu_pinctrl_probe(pdev);
@@ -476,6 +514,8 @@ static struct platform_driver armada_xp_pinctrl_driver = {
        },
        .probe = armada_xp_pinctrl_probe,
        .remove = armada_xp_pinctrl_remove,
+       .suspend = armada_xp_pinctrl_suspend,
+       .resume = armada_xp_pinctrl_resume,
 };
 
 module_platform_driver(armada_xp_pinctrl_driver);