Merge "power: qpnp-qg: Fix SDAM base offset for OCV" (a1a67589) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/power/supply/qcom/qg-reg.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -105,6 +105,8 @@
		#define QG_SDAM_ESR_DISCHARGE_DELTA_OFFSET 0x6E /* 4-byte 0x6E-0x71 */
		#define QG_SDAM_ESR_CHARGE_SF_OFFSET 0x72 /* 2-byte 0x72-0x73 */
		#define QG_SDAM_ESR_DISCHARGE_SF_OFFSET 0x74 /* 2-byte 0x74-0x75 */
		#define QG_SDAM_PON_OCV_OFFSET 0x7C /* 2-byte 0x7C-0x7D */

		/* Below offset is used by PBS */
		#define QG_SDAM_PON_OCV_OFFSET 0xBC /* 2-byte 0xBC-0xBD */

		#endif

drivers/power/supply/qcom/qg-sdam.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ int qg_sdam_write(u8 param, u32 data)
		length = sdam_info[param].length;
		rc = regmap_bulk_write(chip->regmap, offset, (u8 *)&data, length);
		if (rc < 0)
		pr_err("Failed to write offset=%0x4x param=%d value=%d\n",
		pr_err("Failed to write offset=%0x4 param=%d value=%d\n",
		offset, param, data);
		else
		pr_debug("QG SDAM write param=%s value=%d\n",
		@@ -137,11 +137,12 @@ int qg_sdam_read(u8 param, u32 *data)
		return -EINVAL;
		}

		*data = 0;
		offset = chip->sdam_base + sdam_info[param].offset;
		length = sdam_info[param].length;
		rc = regmap_raw_read(chip->regmap, offset, (u8 *)data, length);
		if (rc < 0)
		pr_err("Failed to read offset=%0x4x param=%d\n",
		pr_err("Failed to read offset=%0x4 param=%d\n",
		offset, param);
		else
		pr_debug("QG SDAM read param=%s value=%d\n",
		@@ -163,11 +164,11 @@ int qg_sdam_multibyte_write(u32 offset, u8 *data, u32 length)
		offset = chip->sdam_base + offset;
		rc = regmap_bulk_write(chip->regmap, offset, data, (size_t)length);
		if (rc < 0) {
		pr_err("Failed to write offset=%0x4x value=%d\n",
		pr_err("Failed to write offset=%0x4 value=%d\n",
		offset, *data);
		} else {
		for (i = 0; i < length; i++)
		pr_debug("QG SDAM write offset=%0x4x value=%d\n",
		pr_debug("QG SDAM write offset=%0x4 value=%d\n",
		offset++, data[i]);
		}

		@@ -187,10 +188,10 @@ int qg_sdam_multibyte_read(u32 offset, u8 *data, u32 length)
		offset = chip->sdam_base + offset;
		rc = regmap_raw_read(chip->regmap, offset, (u8 *)data, (size_t)length);
		if (rc < 0) {
		pr_err("Failed to read offset=%0x4x\n", offset);
		pr_err("Failed to read offset=%0x4\n", offset);
		} else {
		for (i = 0; i < length; i++)
		pr_debug("QG SDAM read offset=%0x4x value=%d\n",
		pr_debug("QG SDAM read offset=%0x4 value=%d\n",
		offset++, data[i]);
		}