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

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

Merge "power: qpnp-qg: Allow signed values for Rconn property"

parents 8f5c855a affa09ca

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

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
#define QG_SDAM_ESR_DISCHARGE_SF_OFFSET		0x74 /* 2-byte 0x74-0x75 */

#define QG_SDAM_BATT_AGE_LEVEL_OFFSET		0x76 /* 1-byte 0x76 */

#define QG_SDAM_MAGIC_OFFSET			0x80 /* 4-byte 0x80-0x83 */

#define QG_SDAM_FLASH_OCV_OFFSET		0x84 /* 1-byte 0x84 */

#define QG_SDAM_MAX_OFFSET			0xA4



/* Below offset is used by PBS */

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

+5 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ static struct qg_sdam_info sdam_info[] = { 
		.offset = QG_SDAM_MAGIC_OFFSET,

		.length = 4,

	},

	[SDAM_FLASH_OCV] = {

		.name	= "SDAM_FLASH_OCV_OFFSET",

		.offset = QG_SDAM_FLASH_OCV_OFFSET,

		.length = 1,

	},

};



int qg_sdam_write(u8 param, u32 data)

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

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ enum qg_sdam_param { 
	SDAM_ESR_DISCHARGE_SF,

	SDAM_MAGIC,

	SDAM_BATT_AGE_LEVEL,

	SDAM_FLASH_OCV,

	SDAM_MAX,

};

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

+8 −1
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ static int qg_store_soc_params(struct qpnp_qg *chip) 
{

	int rc, batt_temp = 0, i;

	unsigned long rtc_sec = 0;

	u32 flash_ocv = 0;



	rc = get_rtc_time(&rtc_sec);

	if (rc < 0)
@@ -340,6 +341,12 @@ static int qg_store_soc_params(struct qpnp_qg *chip) 
					i, chip->sdam_data[i]);

	}



	/* store the SDAM OCV */

	flash_ocv = chip->sdam_data[SDAM_OCV_UV] / 20000;

	rc = qg_sdam_write(SDAM_FLASH_OCV, flash_ocv);

	if (rc < 0)

		pr_err("Failed to update flash-ocv rc=%d\n", rc);



	return rc;

}
@@ -4318,7 +4325,7 @@ static int qg_parse_dt(struct qpnp_qg *chip) 
	if (rc < 0)

		chip->dt.rbat_conn_mohm = 0;

	else

		chip->dt.rbat_conn_mohm = temp;

		chip->dt.rbat_conn_mohm = (int)temp;



	/* esr */

	chip->dt.esr_disable = of_property_read_bool(node,