From 64d3d9b49e6e623ea5d0be3784b45f135f5afcc9 Mon Sep 17 00:00:00 2001 From: Nitin Rawat Date: Thu, 12 Dec 2019 12:07:39 +0530 Subject: [PATCH] scsi: ufs: remove voting for hw ice clk We would only enable/disable hw ice clk, we won't set the frequency of this clk from ufs driver. Change-Id: I25a482387facbf3fbbeb201d9513c4c042f10a0e Signed-off-by: Nitin Rawat --- drivers/scsi/ufs/ufshcd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index d365dc3fa9ce..2e837f20fb88 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1014,7 +1014,8 @@ static int ufshcd_set_clk_freq(struct ufs_hba *hba, bool scale_up) list_for_each_entry(clki, head, list) { if (!IS_ERR_OR_NULL(clki->clk)) { if (scale_up && clki->max_freq) { - if (clki->curr_freq == clki->max_freq) + if ((clki->curr_freq == clki->max_freq) || + (!strcmp(clki->name, "core_clk_ice_hw_ctl"))) continue; ret = clk_set_rate(clki->clk, clki->max_freq); @@ -1032,7 +1033,8 @@ static int ufshcd_set_clk_freq(struct ufs_hba *hba, bool scale_up) clki->curr_freq = clki->max_freq; } else if (!scale_up && clki->min_freq) { - if (clki->curr_freq == clki->min_freq) + if ((clki->curr_freq == clki->min_freq) || + (!strcmp(clki->name, "core_clk_ice_hw_ctl"))) continue; ret = clk_set_rate(clki->clk, clki->min_freq); @@ -8316,7 +8318,8 @@ static int ufshcd_init_clocks(struct ufs_hba *hba) goto out; list_for_each_entry(clki, head, list) { - if (!clki->name) + if ((!clki->name) || + (!strcmp(clki->name, "core_clk_ice_hw_ctl"))) continue; clki->clk = devm_clk_get(dev, clki->name);