From ea61514bc0d6732241073f245aa7770cbe5a2fca Mon Sep 17 00:00:00 2001 From: Julien Delacou Date: Tue, 11 Dec 2012 09:17:47 +0100 Subject: [PATCH] --- yaml --- r: 350475 b: refs/heads/master c: 8d99b32d7b9fb542c5efb00a8ec3b96e77be86fd h: refs/heads/master i: 350473: 3cee7526db5d1b12aaefa68214ac6091f68c98db 350471: 593a496d5ca369d21d8f2545d9db1780e5c199e6 v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-nomadik.c | 27 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2c79e8cf9e8e..a1ef3bbeddbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 840a47ba43a2aefbd9834924228549879ee3cb49 +refs/heads/master: 8d99b32d7b9fb542c5efb00a8ec3b96e77be86fd diff --git a/trunk/drivers/pinctrl/pinctrl-nomadik.c b/trunk/drivers/pinctrl/pinctrl-nomadik.c index 1bb16ffb4e41..5d8a0066ab60 100644 --- a/trunk/drivers/pinctrl/pinctrl-nomadik.c +++ b/trunk/drivers/pinctrl/pinctrl-nomadik.c @@ -34,6 +34,7 @@ #include #include #include "pinctrl-nomadik.h" +#include "core.h" /* * The GPIO module in the Nomadik family of Systems-on-Chip is an @@ -1852,6 +1853,28 @@ static const struct of_device_id nmk_pinctrl_match[] = { {}, }; +static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state) +{ + struct nmk_pinctrl *npct; + + npct = platform_get_drvdata(pdev); + if (!npct) + return -EINVAL; + + return pinctrl_force_sleep(npct->pctl); +} + +static int nmk_pinctrl_resume(struct platform_device *pdev) +{ + struct nmk_pinctrl *npct; + + npct = platform_get_drvdata(pdev); + if (!npct) + return -EINVAL; + + return pinctrl_force_default(npct->pctl); +} + static int nmk_pinctrl_probe(struct platform_device *pdev) { const struct platform_device_id *platid = platform_get_device_id(pdev); @@ -1963,6 +1986,10 @@ static struct platform_driver nmk_pinctrl_driver = { }, .probe = nmk_pinctrl_probe, .id_table = nmk_pinctrl_id, +#ifdef CONFIG_PM + .suspend = nmk_pinctrl_suspend, + .resume = nmk_pinctrl_resume, +#endif }; static int __init nmk_gpio_init(void)