Merge "scsi: ufshcd: suspend clock scaling before clocks are gated" (d099051c) · Commits · e / devices / android_kernel_sony_msm8994

drivers/scsi/ufs/ufshcd.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -5420,6 +5420,15 @@ static int ufshcd_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op)
		ufshcd_vreg_set_lpm(hba);

		disable_clks:
		/*
		* The clock scaling needs access to controller registers. Hence, Wait
		* for pending clock scaling work to be done before clocks are
		* turned off.
		*/
		if (ufshcd_is_clkscaling_enabled(hba)) {
		devfreq_suspend_device(hba->devfreq);
		hba->clk_scaling.window_start_t = 0;
		}
		/*
		* Call vendor specific suspend callback. As these callbacks may access
		* vendor specific host controller register space call them before the
		@@ -5452,10 +5461,6 @@ disable_clks:
		*/
		ufshcd_disable_irq(hba);

		if (ufshcd_is_clkscaling_enabled(hba)) {
		devfreq_suspend_device(hba->devfreq);
		hba->clk_scaling.window_start_t = 0;
		}
		goto out;

		vops_resume: