Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977d057a authored by Evan Green's avatar Evan Green Committed by Linus Walleij
Browse files

pinctrl: msm: Add sleep pinctrl state transitions 



Add PM suspend callbacks to the msm core driver that select the
sleep and default pinctrl states. Then wire those callbacks up
in the sdm845 driver, for those boards that may have GPIO hogs
that need to change state during suspend.

Signed-off-by: default avatarEvan Green <evgreen@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 757bd6d5

drivers/pinctrl/qcom/pinctrl-msm.c

+19 −0
Original line number Diff line number Diff line
@@ -1072,6 +1072,25 @@ static void msm_pinctrl_setup_pm_reset(struct msm_pinctrl *pctrl) 
		}

}



static int msm_pinctrl_suspend(struct device *dev)

{

	struct msm_pinctrl *pctrl = dev_get_drvdata(dev);



	return pinctrl_force_sleep(pctrl->pctrl);

}



static int msm_pinctrl_resume(struct device *dev)

{

	struct msm_pinctrl *pctrl = dev_get_drvdata(dev);



	return pinctrl_force_default(pctrl->pctrl);

}



SIMPLE_DEV_PM_OPS(msm_pinctrl_dev_pm_ops, msm_pinctrl_suspend,

		  msm_pinctrl_resume);



EXPORT_SYMBOL(msm_pinctrl_dev_pm_ops);



int msm_pinctrl_probe(struct platform_device *pdev,

		      const struct msm_pinctrl_soc_data *soc_data)

{

drivers/pinctrl/qcom/pinctrl-msm.h

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ struct msm_pinctrl_soc_data { 
	unsigned int ntiles;

};



extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops;



int msm_pinctrl_probe(struct platform_device *pdev,

		      const struct msm_pinctrl_soc_data *soc_data);

int msm_pinctrl_remove(struct platform_device *pdev);

drivers/pinctrl/qcom/pinctrl-sdm845.c

+1 −0
Original line number Diff line number Diff line
@@ -1300,6 +1300,7 @@ static const struct of_device_id sdm845_pinctrl_of_match[] = { 
static struct platform_driver sdm845_pinctrl_driver = {

	.driver = {

		.name = "sdm845-pinctrl",

		.pm = &msm_pinctrl_dev_pm_ops,

		.of_match_table = sdm845_pinctrl_of_match,

	},

	.probe = sdm845_pinctrl_probe,