Message ID | 1579038243-28550-7-git-send-email-han.xu@nxp.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | gpmi/mxs-dma runtime pm patch set | expand |
Han Xu <han.xu@nxp.com> writes: > set the correct pinctrl state in system pm suspend/resume ops > > Signed-off-by: Han Xu <han.xu@nxp.com> > --- > drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c > index 73644c96fa9b..de1e3dbb2eb1 100644 > --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c > +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c > @@ -15,6 +15,7 @@ > #include <linux/of.h> > #include <linux/of_device.h> > #include <linux/pm_runtime.h> > +#include <linux/pinctrl/consumer.h> > #include <linux/dma/mxs-dma.h> > #include "gpmi-nand.h" > #include "gpmi-regs.h" > @@ -2692,6 +2693,7 @@ static int gpmi_pm_suspend(struct device *dev) > { > int ret; > > + pinctrl_pm_select_sleep_state(dev); > ret = pm_runtime_force_suspend(dev); > > return ret; > @@ -2708,6 +2710,8 @@ static int gpmi_pm_resume(struct device *dev) > return ret; > } > > + pinctrl_pm_select_default_state(dev); > + > /* re-init the GPMI registers */ > ret = gpmi_init(this); > if (ret) { Acked-by: Esben Haabendal <esben@geanix.com>
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c index 73644c96fa9b..de1e3dbb2eb1 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c @@ -15,6 +15,7 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/pm_runtime.h> +#include <linux/pinctrl/consumer.h> #include <linux/dma/mxs-dma.h> #include "gpmi-nand.h" #include "gpmi-regs.h" @@ -2692,6 +2693,7 @@ static int gpmi_pm_suspend(struct device *dev) { int ret; + pinctrl_pm_select_sleep_state(dev); ret = pm_runtime_force_suspend(dev); return ret; @@ -2708,6 +2710,8 @@ static int gpmi_pm_resume(struct device *dev) return ret; } + pinctrl_pm_select_default_state(dev); + /* re-init the GPMI registers */ ret = gpmi_init(this); if (ret) {
set the correct pinctrl state in system pm suspend/resume ops Signed-off-by: Han Xu <han.xu@nxp.com> --- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 4 ++++ 1 file changed, 4 insertions(+)