Merge "power: qpnp-fg-gen4: Use ESR_ACT for available power calculation" (530ab629) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/power/supply/qcom/qpnp-fg-gen4.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ struct fg_dt_props {
		bool soc_hi_res;
		int cutoff_volt_mv;
		int empty_volt_mv;
		int sys_min_volt_mv;
		int cutoff_curr_ma;
		int sys_term_curr_ma;
		int delta_soc_thr;
		@@ -893,12 +894,12 @@ static int fg_gen4_get_power(struct fg_gen4_chip chip, int val, bool average)
		if (rc < 0)
		return rc;

		v_min = chip->dt.cutoff_volt_mv * 1000;
		v_min = chip->dt.sys_min_volt_mv * 1000;
		power = (s64)v_min * (v_pred - v_min);

		rc = fg_get_sram_prop(fg, FG_SRAM_ESR, &esr_uohms);
		rc = fg_get_sram_prop(fg, FG_SRAM_ESR_ACT, &esr_uohms);
		if (rc < 0) {
		pr_err("failed to get ESR, rc=%d\n", rc);
		pr_err("failed to get ESR_ACT, rc=%d\n", rc);
		return rc;
		}

		@@ -4628,6 +4629,7 @@ static int fg_parse_esr_cal_params(struct fg_dev *fg)

		#define DEFAULT_CUTOFF_VOLT_MV 3100
		#define DEFAULT_EMPTY_VOLT_MV 2812
		#define DEFAULT_SYS_MIN_VOLT_MV 2800
		#define DEFAULT_SYS_TERM_CURR_MA -125
		#define DEFAULT_CUTOFF_CURR_MA 200
		#define DEFAULT_DELTA_SOC_THR 5 /* 0.5 % */
		@@ -4925,6 +4927,10 @@ static int fg_gen4_parse_dt(struct fg_gen4_chip *chip)
		chip->dt.multi_profile_load = of_property_read_bool(node,
		"qcom,multi-profile-load");
		chip->dt.soc_hi_res = of_property_read_bool(node, "qcom,soc-hi-res");

		chip->dt.sys_min_volt_mv = DEFAULT_SYS_MIN_VOLT_MV;
		of_property_read_u32(node, "qcom,fg-sys-min-voltage",
		&chip->dt.sys_min_volt_mv);
		return 0;
		}