Merge "msm_serial_hs: Change GPIO config sequence during runtime resume/suspend" (8c8d49df) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/tty/serial/msm_serial_hs.c

+16 −14

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		* MSM 7k High speed uart driver
		*
		* Copyright (c) 2008 Google Inc.
		* Copyright (c) 2007-2016, The Linux Foundation. All rights reserved.
		* Copyright (c) 2007-2017, The Linux Foundation. All rights reserved.
		* Modified: Nick Pelly <npelly@google.com>
		*
		* All source code in this file is licensed under the following license
		@@ -3155,6 +3155,11 @@ static void msm_hs_pm_suspend(struct device *dev)
		mutex_lock(&msm_uport->mtx);

		client_count = atomic_read(&msm_uport->client_count);
		msm_uport->pm_state = MSM_HS_PM_SUSPENDED;
		msm_hs_resource_off(msm_uport);
		obs_manage_irq(msm_uport, false);
		msm_hs_clk_bus_unvote(msm_uport);

		/* For OBS, don't use wakeup interrupt, set gpio to suspended state */
		if (msm_uport->obs) {
		ret = pinctrl_select_state(msm_uport->pinctrl,
		@@ -3164,10 +3169,6 @@ static void msm_hs_pm_suspend(struct device *dev)
		__func__);
		}

		msm_uport->pm_state = MSM_HS_PM_SUSPENDED;
		msm_hs_resource_off(msm_uport);
		obs_manage_irq(msm_uport, false);
		msm_hs_clk_bus_unvote(msm_uport);
		if (!atomic_read(&msm_uport->client_req_state))
		enable_wakeup_interrupt(msm_uport);
		LOG_USR_MSG(msm_uport->ipc_msm_hs_pwr_ctxt,
		@@ -3198,15 +3199,6 @@ static int msm_hs_pm_resume(struct device *dev)
		goto exit_pm_resume;
		if (!atomic_read(&msm_uport->client_req_state))
		disable_wakeup_interrupt(msm_uport);
		ret = msm_hs_clk_bus_vote(msm_uport);
		if (ret) {
		MSM_HS_ERR("%s:Failed clock vote %d\n", __func__, ret);
		dev_err(dev, "%s:Failed clock vote %d\n", __func__, ret);
		goto exit_pm_resume;
		}
		obs_manage_irq(msm_uport, true);
		msm_uport->pm_state = MSM_HS_PM_ACTIVE;
		msm_hs_resource_on(msm_uport);

		/* For OBS, don't use wakeup interrupt, set gpio to active state */
		if (msm_uport->obs) {
		@@ -3217,6 +3209,16 @@ static int msm_hs_pm_resume(struct device *dev)
		__func__);
		}

		ret = msm_hs_clk_bus_vote(msm_uport);
		if (ret) {
		MSM_HS_ERR("%s:Failed clock vote %d\n", __func__, ret);
		dev_err(dev, "%s:Failed clock vote %d\n", __func__, ret);
		goto exit_pm_resume;
		}
		obs_manage_irq(msm_uport, true);
		msm_uport->pm_state = MSM_HS_PM_ACTIVE;
		msm_hs_resource_on(msm_uport);

		LOG_USR_MSG(msm_uport->ipc_msm_hs_pwr_ctxt,
		"%s:PM State:Active client_count %d\n", __func__, client_count);
		exit_pm_resume: