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

Commit 963348a4 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4.c7-170826. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2097882   I2227d1dfa19fa75ea25d42702a9757043b8d63dd   Revert "ARM: dts: msm: Add fastrpc vmid flag for sdm660"
2068899   I660e39effc1862051cff8b9babc885d8de3f9c84   power: qpnp-smb2: use correct properties
2093120   I8d6e72cdac1eea6cdfbc9922e484abaeb36021db   ASoC: msm: qdsp6v2: Implement downmix control support fo
2068899   Ieb9c64447f88213479ce14b738f71fa703ffc194   power: qpnp-smb2: expose CHARGE_COUNTER prop via batt ps
2083638   I451d3e861ea28f89029fe8759599ac0e133baf11   qcom: smb138x: supsend USBIN and disable OTG before shut
2094946   Idcc4ca838741aac26662a679117af9d9c935e630   ASoC: msm: qdspv2: add an API to destroy ion client

Change-Id: I9ce3e2cea3ea371f551023e235f5a5048dcc4501
CRs-Fixed: 2068899, 2093120, 2083638, 2094946, 2097882
parents ca8bc9db e598aae8

arch/arm/boot/dts/qcom/sdm660.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -1567,7 +1567,6 @@ 
	qcom,msm_fastrpc {

		compatible = "qcom,msm-fastrpc-adsp";

		qcom,fastrpc-glink;

		qcom,fastrpc-vmid-heap-shared;



		qcom,msm_fastrpc_compute_cb1 {

			compatible = "qcom,msm-fastrpc-compute-cb";

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

+37 −18
Original line number Diff line number Diff line
@@ -330,7 +330,6 @@ static int smb2_parse_dt(struct smb2 *chip) 
static enum power_supply_property smb2_usb_props[] = {

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_VOLTAGE_MIN,

	POWER_SUPPLY_PROP_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_VOLTAGE_NOW,

	POWER_SUPPLY_PROP_PD_CURRENT_MAX,
@@ -349,6 +348,9 @@ static enum power_supply_property smb2_usb_props[] = { 
	POWER_SUPPLY_PROP_HW_CURRENT_MAX,

	POWER_SUPPLY_PROP_REAL_TYPE,

	POWER_SUPPLY_PROP_PR_SWAP,

	POWER_SUPPLY_PROP_PD_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_PD_VOLTAGE_MIN,

	POWER_SUPPLY_PROP_SDP_CURRENT_MAX,

};



static int smb2_usb_get_prop(struct power_supply *psy,
@@ -380,20 +382,17 @@ static int smb2_usb_get_prop(struct power_supply *psy, 
		if (chg->real_charger_type == POWER_SUPPLY_TYPE_UNKNOWN)

			val->intval = 0;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MIN:

		val->intval = chg->voltage_min_uv;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		val->intval = chg->voltage_max_uv;

		rc = smblib_get_prop_usb_voltage_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		rc = smblib_get_prop_usb_voltage_now(chg, val);

		break;

	case POWER_SUPPLY_PROP_PD_CURRENT_MAX:

		rc = smblib_get_prop_pd_current_max(chg, val);

		val->intval = get_client_vote(chg->usb_icl_votable, PD_VOTER);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smblib_get_prop_usb_current_max(chg, val);

		rc = smblib_get_prop_input_current_settled(chg, val);

		break;

	case POWER_SUPPLY_PROP_TYPE:

		val->intval = POWER_SUPPLY_TYPE_USB_PD;
@@ -457,6 +456,16 @@ static int smb2_usb_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_PR_SWAP:

		rc = smblib_get_prop_pr_swap_in_progress(chg, val);

		break;

	case POWER_SUPPLY_PROP_PD_VOLTAGE_MAX:

		val->intval = chg->voltage_max_uv;

		break;

	case POWER_SUPPLY_PROP_PD_VOLTAGE_MIN:

		val->intval = chg->voltage_min_uv;

		break;

	case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:

		val->intval = get_client_vote(chg->usb_icl_votable,

					      USB_PSY_VOTER);

		break;

	default:

		pr_err("get prop %d is not supported in usb\n", psp);

		rc = -EINVAL;
@@ -484,18 +493,9 @@ static int smb2_usb_set_prop(struct power_supply *psy, 
	}



	switch (psp) {

	case POWER_SUPPLY_PROP_VOLTAGE_MIN:

		rc = smblib_set_prop_usb_voltage_min(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		rc = smblib_set_prop_usb_voltage_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_PD_CURRENT_MAX:

		rc = smblib_set_prop_pd_current_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smblib_set_prop_usb_current_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:

		rc = smblib_set_prop_typec_power_role(chg, val);

		break;
@@ -518,6 +518,15 @@ static int smb2_usb_set_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_PR_SWAP:

		rc = smblib_set_prop_pr_swap_in_progress(chg, val);

		break;

	case POWER_SUPPLY_PROP_PD_VOLTAGE_MAX:

		rc = smblib_set_prop_pd_voltage_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_PD_VOLTAGE_MIN:

		rc = smblib_set_prop_pd_voltage_min(chg, val);

		break;

	case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:

		rc = smblib_set_prop_sdp_current_max(chg, val);

		break;

	default:

		pr_err("set prop %d is not supported\n", psp);

		rc = -EINVAL;
@@ -533,8 +542,6 @@ static int smb2_usb_prop_is_writeable(struct power_supply *psy, 
		enum power_supply_property psp)

{

	switch (psp) {

	case POWER_SUPPLY_PROP_CURRENT_MAX:

	case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:

	case POWER_SUPPLY_PROP_CTM_CURRENT_MAX:

		return 1;

	default:
@@ -576,6 +583,8 @@ static int smb2_init_usb_psy(struct smb2 *chip) 
static enum power_supply_property smb2_usb_port_props[] = {

	POWER_SUPPLY_PROP_TYPE,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_CURRENT_MAX,

};



static int smb2_usb_port_get_prop(struct power_supply *psy,
@@ -602,6 +611,12 @@ static int smb2_usb_port_get_prop(struct power_supply *psy, 
		else

			val->intval = 0;

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		val->intval = 5000000;

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smblib_get_prop_input_current_settled(chg, val);

		break;

	default:

		pr_err_ratelimited("Get prop %d is not supported in pc_port\n",

				psp);
@@ -912,6 +927,7 @@ static enum power_supply_property smb2_batt_props[] = { 
	POWER_SUPPLY_PROP_DIE_HEALTH,

	POWER_SUPPLY_PROP_RERUN_AICL,

	POWER_SUPPLY_PROP_DP_DM,

	POWER_SUPPLY_PROP_CHARGE_COUNTER,

};



static int smb2_batt_get_prop(struct power_supply *psy,
@@ -1017,6 +1033,9 @@ static int smb2_batt_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_RERUN_AICL:

		val->intval = 0;

		break;

	case POWER_SUPPLY_PROP_CHARGE_COUNTER:

		rc = smblib_get_prop_batt_charge_counter(chg, val);

		break;

	default:

		pr_err("batt power supply prop %d not supported\n", psp);

		return -EINVAL;

drivers/power/supply/qcom/smb-lib.c

+48 −29
Original line number Diff line number Diff line
@@ -420,20 +420,22 @@ static int smblib_set_adapter_allowance(struct smb_charger *chg, 
{

	int rc = 0;



	/* PM660 only support max. 9V */

	if (chg->smb_version == PM660_SUBTYPE) {

		switch (allowed_voltage) {

		case USBIN_ADAPTER_ALLOW_12V:

	case USBIN_ADAPTER_ALLOW_5V_OR_12V:

		case USBIN_ADAPTER_ALLOW_9V_TO_12V:

			allowed_voltage = USBIN_ADAPTER_ALLOW_9V;

			break;

		case USBIN_ADAPTER_ALLOW_5V_OR_12V:

		case USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V:

	case USBIN_ADAPTER_ALLOW_5V_TO_12V:

		/* PM660 only support max. 9V */

		if (chg->smb_version == PM660_SUBTYPE) {

			smblib_dbg(chg, PR_MISC, "voltage not supported=%d\n",

					allowed_voltage);

			allowed_voltage = USBIN_ADAPTER_ALLOW_5V_OR_9V;

		}

			break;

		case USBIN_ADAPTER_ALLOW_5V_TO_12V:

			allowed_voltage = USBIN_ADAPTER_ALLOW_5V_TO_9V;

			break;

		}

	}



	rc = smblib_write(chg, USBIN_ADAPTER_ALLOW_CFG_REG, allowed_voltage);

	if (rc < 0) {
@@ -1843,6 +1845,19 @@ int smblib_get_prop_charge_qnovo_enable(struct smb_charger *chg, 
	return 0;

}



int smblib_get_prop_batt_charge_counter(struct smb_charger *chg,

				     union power_supply_propval *val)

{

	int rc;



	if (!chg->bms_psy)

		return -EINVAL;



	rc = power_supply_get_property(chg->bms_psy,

				       POWER_SUPPLY_PROP_CHARGE_COUNTER, val);

	return rc;

}



/***********************

 * BATTERY PSY SETTERS *

 ***********************/
@@ -2187,6 +2202,25 @@ int smblib_get_prop_usb_online(struct smb_charger *chg, 
	return rc;

}



int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	switch (chg->real_charger_type) {

	case POWER_SUPPLY_TYPE_USB_HVDCP:

	case POWER_SUPPLY_TYPE_USB_PD:

		if (chg->smb_version == PM660_SUBTYPE)

			val->intval = MICRO_9V;

		else

			val->intval = MICRO_12V;

		break;

	default:

		val->intval = MICRO_5V;

		break;

	}



	return 0;

}



int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,

				    union power_supply_propval *val)

{
@@ -2206,21 +2240,6 @@ int smblib_get_prop_usb_voltage_now(struct smb_charger *chg, 
	return iio_read_channel_processed(chg->iio.usbin_v_chan, &val->intval);

}



int smblib_get_prop_pd_current_max(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	val->intval = get_client_vote_locked(chg->usb_icl_votable, PD_VOTER);

	return 0;

}



int smblib_get_prop_usb_current_max(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	val->intval = get_client_vote_locked(chg->usb_icl_votable,

			USB_PSY_VOTER);

	return 0;

}



int smblib_get_prop_usb_current_now(struct smb_charger *chg,

				    union power_supply_propval *val)

{
@@ -2558,7 +2577,7 @@ static int smblib_handle_usb_current(struct smb_charger *chg, 
	return rc;

}



int smblib_set_prop_usb_current_max(struct smb_charger *chg,

int smblib_set_prop_sdp_current_max(struct smb_charger *chg,

				    const union power_supply_propval *val)

{

	int rc = 0;
@@ -2645,7 +2664,7 @@ int smblib_set_prop_typec_power_role(struct smb_charger *chg, 
	return rc;

}



int smblib_set_prop_usb_voltage_min(struct smb_charger *chg,

int smblib_set_prop_pd_voltage_min(struct smb_charger *chg,

				    const union power_supply_propval *val)

{

	int rc, min_uv;
@@ -2664,7 +2683,7 @@ int smblib_set_prop_usb_voltage_min(struct smb_charger *chg, 
	return rc;

}



int smblib_set_prop_usb_voltage_max(struct smb_charger *chg,

int smblib_set_prop_pd_voltage_max(struct smb_charger *chg,

				    const union power_supply_propval *val)

{

	int rc, max_uv;

drivers/power/supply/qcom/smb-lib.h

+7 −7
Original line number Diff line number Diff line
@@ -419,6 +419,8 @@ int smblib_get_prop_batt_current_now(struct smb_charger *chg, 
				union power_supply_propval *val);

int smblib_get_prop_batt_temp(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_batt_charge_counter(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_set_prop_input_suspend(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_set_prop_batt_capacity(struct smb_charger *chg,
@@ -443,11 +445,9 @@ int smblib_get_prop_usb_online(struct smb_charger *chg, 
				union power_supply_propval *val);

int smblib_get_prop_usb_suspend(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_pd_current_max(struct smb_charger *chg,

int smblib_get_prop_usb_voltage_max(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_usb_current_max(struct smb_charger *chg,

int smblib_get_prop_usb_voltage_now(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_usb_current_now(struct smb_charger *chg,

				union power_supply_propval *val);
@@ -475,11 +475,11 @@ int smblib_get_prop_charge_qnovo_enable(struct smb_charger *chg, 
			       union power_supply_propval *val);

int smblib_set_prop_pd_current_max(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_set_prop_usb_current_max(struct smb_charger *chg,

int smblib_set_prop_sdp_current_max(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_set_prop_usb_voltage_min(struct smb_charger *chg,

int smblib_set_prop_pd_voltage_max(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_set_prop_usb_voltage_max(struct smb_charger *chg,

int smblib_set_prop_pd_voltage_min(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_set_prop_boost_current(struct smb_charger *chg,

				const union power_supply_propval *val);

drivers/power/supply/qcom/smb138x-charger.c

+51 −19
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ static enum power_supply_property smb138x_usb_props[] = { 
	POWER_SUPPLY_PROP_TYPEC_MODE,

	POWER_SUPPLY_PROP_TYPEC_POWER_ROLE,

	POWER_SUPPLY_PROP_TYPEC_CC_ORIENTATION,

	POWER_SUPPLY_PROP_SDP_CURRENT_MAX,

};



static int smb138x_usb_get_prop(struct power_supply *psy,
@@ -242,7 +243,7 @@ static int smb138x_usb_get_prop(struct power_supply *psy, 
		rc = smblib_get_prop_usb_voltage_now(chg, val);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smblib_get_prop_usb_current_max(chg, val);

		val->intval = get_effective_result(chg->usb_icl_votable);

		break;

	case POWER_SUPPLY_PROP_TYPE:

		val->intval = chg->usb_psy_desc.type;
@@ -256,6 +257,10 @@ static int smb138x_usb_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_TYPEC_CC_ORIENTATION:

		rc = smblib_get_prop_typec_cc_orientation(chg, val);

		break;

	case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:

		val->intval = get_client_vote(chg->usb_icl_votable,

					      USB_PSY_VOTER);

		break;

	default:

		pr_err("get prop %d is not supported\n", prop);

		return -EINVAL;
@@ -278,18 +283,12 @@ static int smb138x_usb_set_prop(struct power_supply *psy, 
	int rc = 0;



	switch (prop) {

	case POWER_SUPPLY_PROP_VOLTAGE_MIN:

		rc = smblib_set_prop_usb_voltage_min(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		rc = smblib_set_prop_usb_voltage_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smblib_set_prop_usb_current_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:

		rc = smblib_set_prop_typec_power_role(chg, val);

		break;

	case POWER_SUPPLY_PROP_SDP_CURRENT_MAX:

		rc = smblib_set_prop_sdp_current_max(chg, val);

		break;

	default:

		pr_err("set prop %d is not supported\n", prop);

		return -EINVAL;
@@ -301,13 +300,6 @@ static int smb138x_usb_set_prop(struct power_supply *psy, 
static int smb138x_usb_prop_is_writeable(struct power_supply *psy,

					 enum power_supply_property prop)

{

	switch (prop) {

	case POWER_SUPPLY_PROP_TYPEC_POWER_ROLE:

		return 1;

	default:

		break;

	}



	return 0;

}
@@ -871,6 +863,13 @@ static int smb138x_init_slave_hw(struct smb138x *chip) 
		return rc;

	}



	/* Disable OTG */

	rc = smblib_masked_write(chg, CMD_OTG_REG, OTG_EN_BIT, 0);

	if (rc < 0) {

		pr_err("Couldn't disable OTG rc=%d\n", rc);

		return rc;

	}



	/* suspend parallel charging */

	rc = smb138x_set_parallel_suspend(chip, true);

	if (rc < 0) {
@@ -968,6 +967,20 @@ static int smb138x_init_hw(struct smb138x *chip) 


	chg->dcp_icl_ua = chip->dt.usb_icl_ua;



	/* Disable OTG */

	rc = smblib_masked_write(chg, CMD_OTG_REG, OTG_EN_BIT, 0);

	if (rc < 0) {

		pr_err("Couldn't disable OTG rc=%d\n", rc);

		return rc;

	}



	/* Unsuspend USB input */

	rc = smblib_masked_write(chg, USBIN_CMD_IL_REG, USBIN_SUSPEND_BIT, 0);

	if (rc < 0) {

		pr_err("Couldn't unsuspend USB, rc=%d\n", rc);

		return rc;

	}



	/* configure to a fixed 700khz freq to avoid tdie errors */

	rc = smblib_set_charge_param(chg, &chg->param.freq_buck, 700);

	if (rc < 0) {
@@ -1608,6 +1621,24 @@ static int smb138x_remove(struct platform_device *pdev) 
	return 0;

}



static void smb138x_shutdown(struct platform_device *pdev)

{

	struct smb138x *chip = platform_get_drvdata(pdev);

	struct smb_charger *chg = &chip->chg;

	int rc;



	/* Suspend charging */

	rc = smb138x_set_parallel_suspend(chip, true);

	if (rc < 0)

		pr_err("Couldn't suspend charging rc=%d\n", rc);



	/* Disable OTG */

	rc = smblib_masked_write(chg, CMD_OTG_REG, OTG_EN_BIT, 0);

	if (rc < 0)

		pr_err("Couldn't disable OTG rc=%d\n", rc);



}



static struct platform_driver smb138x_driver = {

	.driver	= {

		.name		= "qcom,smb138x-charger",
@@ -1616,6 +1647,7 @@ static struct platform_driver smb138x_driver = { 
	},

	.probe		= smb138x_probe,

	.remove		= smb138x_remove,

	.shutdown	= smb138x_shutdown,

};

module_platform_driver(smb138x_driver);