Merge "power: smb5-lib: Set parallel charger configuration is uUSB removal path" (ea0abdef) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -2643,12 +2643,17 @@ static int smb5_probe(struct platform_device *pdev)
		goto cleanup;
		}

		if (chg->smb_version == PM8150B_SUBTYPE) {
		switch (chg->smb_version) {
		case PM8150B_SUBTYPE:
		case PM6150_SUBTYPE:
		rc = smb5_init_dc_psy(chip);
		if (rc < 0) {
		pr_err("Couldn't initialize dc psy rc=%d\n", rc);
		goto cleanup;
		}
		break;
		default:
		break;
		}

		rc = smb5_init_usb_psy(chip);

+8 −0

Original line number	Diff line number	Diff line
		@@ -816,6 +816,14 @@ static void smblib_uusb_removal(struct smb_charger *chg)
		struct smb_irq_data *data;
		struct storm_watch *wdata;

		chg->cp_reason = POWER_SUPPLY_CP_NONE;
		rc = smblib_select_sec_charger(chg,
		chg->sec_pl_present ? POWER_SUPPLY_CHARGER_SEC_PL :
		POWER_SUPPLY_CHARGER_SEC_NONE);
		if (rc < 0)
		dev_err(chg->dev, "Couldn't disable secondary charger rc=%d\n",
		rc);

		cancel_delayed_work_sync(&chg->pl_enable_work);

		if (chg->wa_flags & BOOST_BACK_WA) {