Merge "icnss: Avoid setting voltage for WCSSS_CX_MX" (b6aa6232) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/soc/qcom/icnss.c

+36 −20

Original line number	Original line	Diff line number	Diff line
	@@ -260,9 +260,11 @@ static int icnss_vreg_on(struct icnss_priv *priv)
	if (!vreg_info->reg)		if (!vreg_info->reg)
	continue;		continue;

	icnss_pr_vdbg("Regulator %s being enabled\n", vreg_info->name);		if (vreg_info->min_v \|\| vreg_info->max_v) {
			icnss_pr_vdbg("Set voltage for regulator %s\n",
	ret = regulator_set_voltage(vreg_info->reg, vreg_info->min_v,		vreg_info->name);
			ret = regulator_set_voltage(vreg_info->reg,
			vreg_info->min_v,
	vreg_info->max_v);		vreg_info->max_v);
	if (ret) {		if (ret) {
	icnss_pr_err("Regulator %s, can't set voltage: min_v: %u, max_v: %u, ret: %d\n",		icnss_pr_err("Regulator %s, can't set voltage: min_v: %u, max_v: %u, ret: %d\n",
	@@ -270,8 +272,11 @@ static int icnss_vreg_on(struct icnss_priv *priv)
	vreg_info->max_v, ret);		vreg_info->max_v, ret);
	break;		break;
	}		}
			}

	if (vreg_info->load_ua) {		if (vreg_info->load_ua) {
			icnss_pr_vdbg("Set load for regulator %s\n",
			vreg_info->name);
	ret = regulator_set_load(vreg_info->reg,		ret = regulator_set_load(vreg_info->reg,
	vreg_info->load_ua);		vreg_info->load_ua);
	if (ret < 0) {		if (ret < 0) {
	@@ -282,6 +287,8 @@ static int icnss_vreg_on(struct icnss_priv *priv)
	}		}
	}		}

			icnss_pr_vdbg("Regulator %s being enabled\n", vreg_info->name);

	ret = regulator_enable(vreg_info->reg);		ret = regulator_enable(vreg_info->reg);
	if (ret) {		if (ret) {
	icnss_pr_err("Regulator %s, can't enable: %d\n",		icnss_pr_err("Regulator %s, can't enable: %d\n",
	@@ -303,8 +310,13 @@ static int icnss_vreg_on(struct icnss_priv *priv)
	continue;		continue;

	regulator_disable(vreg_info->reg);		regulator_disable(vreg_info->reg);

			if (vreg_info->load_ua)
	regulator_set_load(vreg_info->reg, 0);		regulator_set_load(vreg_info->reg, 0);
	regulator_set_voltage(vreg_info->reg, 0, vreg_info->max_v);
			if (vreg_info->min_v \|\| vreg_info->max_v)
			regulator_set_voltage(vreg_info->reg, 0,
			vreg_info->max_v);
	}		}

	return ret;		return ret;
	@@ -329,17 +341,21 @@ static int icnss_vreg_off(struct icnss_priv *priv)
	icnss_pr_err("Regulator %s, can't disable: %d\n",		icnss_pr_err("Regulator %s, can't disable: %d\n",
	vreg_info->name, ret);		vreg_info->name, ret);

			if (vreg_info->load_ua) {
	ret = regulator_set_load(vreg_info->reg, 0);		ret = regulator_set_load(vreg_info->reg, 0);
	if (ret < 0)		if (ret < 0)
	icnss_pr_err("Regulator %s, can't set load: %d\n",		icnss_pr_err("Regulator %s, can't set load: %d\n",
	vreg_info->name, ret);		vreg_info->name, ret);
			}

			if (vreg_info->min_v \|\| vreg_info->max_v) {
	ret = regulator_set_voltage(vreg_info->reg, 0,		ret = regulator_set_voltage(vreg_info->reg, 0,
	vreg_info->max_v);		vreg_info->max_v);
	if (ret)		if (ret)
	icnss_pr_err("Regulator %s, can't set voltage: %d\n",		icnss_pr_err("Regulator %s, can't set voltage: %d\n",
	vreg_info->name, ret);		vreg_info->name, ret);
	}		}
			}

	return ret;		return ret;
	}		}