Merge "spi_qsd: Vote for PNOC clock before spi clock" (c45217b7) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/spi/spi_qsd.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -2613,10 +2613,12 @@ static int msm_spi_pm_suspend_runtime(struct device *device)
		msm_spi_bam_pipe_disconnect(dd, &dd->bam.prod);
		msm_spi_bam_pipe_disconnect(dd, &dd->bam.cons);
		}
		if (dd->pdata && !dd->pdata->active_only)
		msm_spi_clk_path_unvote(dd);
		if (dd->pdata && !dd->pdata->is_shared)
		put_local_resources(dd);

		if (dd->pdata && !dd->pdata->active_only)
		msm_spi_clk_path_unvote(dd);

		suspend_exit:
		return 0;
		}
		@@ -2644,14 +2646,15 @@ static int msm_spi_pm_resume_runtime(struct device *device)
		else
		dd->is_init_complete = true;
		}
		msm_spi_clk_path_init(dd);
		if (!dd->pdata->active_only)
		msm_spi_clk_path_vote(dd);

		if (!dd->pdata->is_shared) {
		ret = get_local_resources(dd);
		if (ret)
		return ret;
		}
		msm_spi_clk_path_init(dd);
		if (!dd->pdata->active_only)
		msm_spi_clk_path_vote(dd);
		if (!dd->pdata->is_shared && dd->use_dma) {
		msm_spi_bam_pipe_connect(dd, &dd->bam.prod,
		&dd->bam.prod.config);