Merge "power: batterydata-lib: Add an API to interpolate OCV-SOC slope" (721f5b39) · Commits · e / devices / android_kernel_sony_msm8994

drivers/power/batterydata-lib.c

+74 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -337,3 +337,76 @@ int interpolate_pc(struct pc_temp_ocv_lut *pc_temp_ocv,
		ocv, batt_temp);
		return 100;
		}

		int interpolate_slope(struct pc_temp_ocv_lut *pc_temp_ocv,
		int batt_temp, int pc)
		{
		int i, ocvrow1, ocvrow2, rows, cols;
		int row1 = 0;
		int row2 = 0;
		int slope;

		rows = pc_temp_ocv->rows;
		cols = pc_temp_ocv->cols;
		if (pc >= pc_temp_ocv->percent[0]) {
		pr_debug("pc %d >= max pc range - use the slope at pc=%d\n",
		pc, pc_temp_ocv->percent[0]);
		row1 = 0;
		row2 = 1;
		} else if (pc <= pc_temp_ocv->percent[rows - 1]) {
		pr_debug("pc %d is <= min pc range - use the slope at pc=%d\n",
		pc, pc_temp_ocv->percent[rows - 1]);
		row1 = rows - 2;
		row2 = rows - 1;
		} else {
		for (i = 0; i < rows; i++) {
		if (pc == pc_temp_ocv->percent[i]) {
		row1 = i - 1;
		row2 = i;
		break;
		}
		if (pc > pc_temp_ocv->percent[i]) {
		row1 = i - 1;
		row2 = i;
		break;
		}
		}
		}

		if (batt_temp < pc_temp_ocv->temp[0] * DEGC_SCALE)
		batt_temp = pc_temp_ocv->temp[0] * DEGC_SCALE;
		if (batt_temp > pc_temp_ocv->temp[cols - 1] * DEGC_SCALE)
		batt_temp = pc_temp_ocv->temp[cols - 1] * DEGC_SCALE;

		for (i = 0; i < cols; i++)
		if (batt_temp <= pc_temp_ocv->temp[i] * DEGC_SCALE)
		break;

		if (batt_temp == pc_temp_ocv->temp[i] * DEGC_SCALE) {
		slope = (pc_temp_ocv->ocv[row1][i] -
		pc_temp_ocv->ocv[row2][i]);
		slope *= 1000;
		slope /= (pc_temp_ocv->percent[row1] -
		pc_temp_ocv->percent[row2]);
		return slope;
		}
		ocvrow1 = linear_interpolate(
		pc_temp_ocv->ocv[row1][i - 1],
		pc_temp_ocv->temp[i - 1] * DEGC_SCALE,
		pc_temp_ocv->ocv[row1][i],
		pc_temp_ocv->temp[i] * DEGC_SCALE,
		batt_temp);

		ocvrow2 = linear_interpolate(
		pc_temp_ocv->ocv[row2][i - 1],
		pc_temp_ocv->temp[i - 1] * DEGC_SCALE,
		pc_temp_ocv->ocv[row2][i],
		pc_temp_ocv->temp[i] * DEGC_SCALE,
		batt_temp);

		slope = (ocvrow1 - ocvrow2);
		slope *= 1000;
		slope /= (pc_temp_ocv->percent[row1] - pc_temp_ocv->percent[row2]);

		return slope;
		}

include/linux/batterydata-lib.h

+8 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -145,6 +145,8 @@ int interpolate_pc(struct pc_temp_ocv_lut *pc_temp_ocv,
		int batt_temp_degc, int ocv);
		int interpolate_ocv(struct pc_temp_ocv_lut *pc_temp_ocv,
		int batt_temp_degc, int pc);
		int interpolate_slope(struct pc_temp_ocv_lut *pc_temp_ocv,
		int batt_temp, int pc);
		int linear_interpolate(int y0, int x0, int y1, int x1, int x);
		int is_between(int left, int right, int value);
		#else
		@@ -173,6 +175,11 @@ static inline int interpolate_ocv(struct pc_temp_ocv_lut *pc_temp_ocv,
		{
		return -EINVAL;
		}
		static inline int interpolate_slope(struct pc_temp_ocv_lut *pc_temp_ocv,
		int batt_temp, int pc)
		{
		return -EINVAL;
		}
		static inline int linear_interpolate(int y0, int x0, int y1, int x1, int x)
		{
		return -EINVAL;