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

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

Merge "scsi: ufs: remove voting for hw ice clk"

parents 89b721d3 fb36904e

drivers/scsi/ufs/ufshcd.c

+6 −3
Original line number Diff line number Diff line
@@ -1477,7 +1477,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);
@@ -1495,7 +1496,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);
@@ -9826,7 +9828,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);