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

Commit 1858731c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Change default state to sleep"

parents 77b6d4fe b12c6840

asoc/sa6155.c

+12 −4
Original line number Diff line number Diff line
@@ -3946,12 +3946,20 @@ static int msm_pinctrl_init(struct platform_device *pdev, enum pinctrl_mode mode 
		pinctrl_info->pinctrl = pinctrl;



		/* get all the states handles from Device Tree */

		if (mode == TDM_PINCTRL)

			pinctrl_info->sleep = pinctrl_lookup_state(pinctrl,

				"default");

		else

			pinctrl_info->sleep = pinctrl_lookup_state(pinctrl,

                                "sleep");

		if (IS_ERR(pinctrl_info->sleep)) {

			pr_err("%s: could not get sleep pin state\n", __func__);

			goto err;

		}

		if (mode == TDM_PINCTRL)

			pinctrl_info->active = pinctrl_lookup_state(pinctrl,

				"active");

		else

			pinctrl_info->active = pinctrl_lookup_state(pinctrl,

                                "default");

		if (IS_ERR(pinctrl_info->active)) {

asoc/sa8155.c

+2 −2
Original line number Diff line number Diff line
@@ -5183,13 +5183,13 @@ static int msm_get_pinctrl(struct platform_device *pdev) 


		/* get all the states handles from Device Tree */

		pinctrl_info->sleep = pinctrl_lookup_state(pinctrl,

							"sleep");

							"default");

		if (IS_ERR(pinctrl_info->sleep)) {

			pr_err("%s: could not get sleep pin state\n", __func__);

			goto err;

		}

		pinctrl_info->active = pinctrl_lookup_state(pinctrl,

							"default");

							"active");

		if (IS_ERR(pinctrl_info->active)) {

			pr_err("%s: could not get active pin state\n",

				__func__);