[v3] pinctrl: imx8mq: Add suspend/resume ops

Commit Message

Abel Vesa April 8, 2019, 6:38 p.m. UTC

To support pinctl hog restore after LPSR resume back,
add the generic suspend/resume in pinctrl-imx along with the
generic pm ops to be used by platform specific drivers. Then
make use of the newly added ops in i.MX8MQ platform specific
driver.

Signed-off-by: Robin Gong <[e-mail]>
Signed-off-by: Abel Vesa <[e-mail]>
---

Changes since v2:
 * removed the pinctrl-imx8mq with imx8mq in the subject
 * added static and __maybe_unused to both suspend and resume
 * removed the useless null checks

 drivers/pinctrl/freescale/pinctrl-imx.c    | 19 +++++++++++++++++++
 drivers/pinctrl/freescale/pinctrl-imx.h    |  1 +
 drivers/pinctrl/freescale/pinctrl-imx8mq.c |  1 +
 3 files changed, 21 insertions(+)

Comments

Dong Aisheng April 9, 2019, 3:30 a.m. UTC | #1

> From: Abel Vesa
> Sent: Tuesday, April 9, 2019 2:39 AM
> 
> To support pinctl hog restore after LPSR resume back, add the generic
> suspend/resume in pinctrl-imx along with the generic pm ops to be used by
> platform specific drivers. Then make use of the newly added ops in i.MX8MQ
> platform specific driver.
> 
> Signed-off-by: Robin Gong <[e-mail]>
> Signed-off-by: Abel Vesa <[e-mail]>

Acked-by: Dong Aisheng <[e-mail]>

Regards
Dong Aisheng

Linus Walleij April 11, 2019, 1:27 p.m. UTC | #2

On Mon, Apr 8, 2019 at 8:38 PM Abel Vesa <[e-mail]> wrote:

> To support pinctl hog restore after LPSR resume back,
> add the generic suspend/resume in pinctrl-imx along with the
> generic pm ops to be used by platform specific drivers. Then
> make use of the newly added ops in i.MX8MQ platform specific
> driver.
>
> Signed-off-by: Robin Gong <[e-mail]>
> Signed-off-by: Abel Vesa <[e-mail]>

This v3 version applied with Dong's ACK.

Yours,
Linus Walleij

Patch

diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 188001b..93a86d2 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -887,3 +887,22 @@  int imx_pinctrl_probe(struct platform_device *pdev,
 
 	return ret;
 }
+
+static int __maybe_unused imx_pinctrl_suspend(struct device *dev)
+{
+	struct imx_pinctrl *ipctl = dev_get_drvdata(dev);
+
+	return pinctrl_force_sleep(ipctl->pctl);
+}
+
+static int __maybe_unused imx_pinctrl_resume(struct device *dev)
+{
+	struct imx_pinctrl *ipctl = dev_get_drvdata(dev);
+
+	return pinctrl_force_default(ipctl->pctl);
+}
+
+const struct dev_pm_ops imx_pinctrl_pm_ops = {
+	SET_LATE_SYSTEM_SLEEP_PM_OPS(imx_pinctrl_suspend,
+					imx_pinctrl_resume)
+};
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h
index 98a4889..333d32b 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.h
+++ b/drivers/pinctrl/freescale/pinctrl-imx.h
@@ -17,6 +17,7 @@ 
 struct platform_device;
 
 extern struct pinmux_ops imx_pmx_ops;
+extern const struct dev_pm_ops imx_pinctrl_pm_ops;
 
 /**
  * struct imx_pin_mmio - MMIO pin configurations
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8mq.c b/drivers/pinctrl/freescale/pinctrl-imx8mq.c
index 8d39af5..50aa1c0 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8mq.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8mq.c
@@ -339,6 +339,7 @@  static struct platform_driver imx8mq_pinctrl_driver = {
 	.driver = {
 		.name = "imx8mq-pinctrl",
 		.of_match_table = of_match_ptr(imx8mq_pinctrl_of_match),
+		.pm = &imx_pinctrl_pm_ops,
 		.suppress_bind_attrs = true,
 	},
 	.probe = imx8mq_pinctrl_probe,