diff options
| author | Li Jun <jun.li@nxp.com> | 2017-06-09 18:29:22 +0800 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-14 16:44:06 +0800 |
| commit | d86a769077a46ed5d7a52cb5dc79762f366d1ae8 (patch) | |
| tree | 2ea7b99cb11e6f7cbb0ba17c57e0083f196c370b /drivers | |
| parent | 42b8fc00d68c4bb474b450c2cc9422a01d469b8d (diff) | |
MLK-15032-2 Revert "extcon: usb-gpio: add pinctrl operation during system PM"
This reverts commit 4c7d332e3316 ("MLK-13638-3 extcon: usb-gpio: add
pinctrl operation during system PM"). We will use the upstream version.
Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
(cherry picked from commit bf584fcb7294cac67c67b552d7b347b6e59fe243)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/extcon/extcon-usb-gpio.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index a72ad077f2ab..a27d350f69e3 100644 --- a/drivers/extcon/extcon-usb-gpio.c +++ b/drivers/extcon/extcon-usb-gpio.c @@ -23,7 +23,6 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/of_gpio.h> -#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> #include <linux/pm_wakeirq.h> #include <linux/slab.h> @@ -177,7 +176,6 @@ static int usb_extcon_suspend(struct device *dev) * accessible until resume completes. So disable IRQ. */ disable_irq(info->id_irq); - pinctrl_pm_select_sleep_state(dev); return ret; } @@ -187,7 +185,6 @@ static int usb_extcon_resume(struct device *dev) struct usb_extcon_info *info = dev_get_drvdata(dev); int ret = 0; - pinctrl_pm_select_default_state(dev); enable_irq(info->id_irq); if (!device_may_wakeup(dev)) queue_delayed_work(system_power_efficient_wq, |