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

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

Merge "power: smb5-lib: switch charging in SMB1355 per SMB_EN status"

parents 031c33b2 f02a6a0f

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

+7 −1
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ static int smblib_select_sec_charger(struct smb_charger *chg, int sec_chg) 


	switch (sec_chg) {

	case POWER_SUPPLY_CHARGER_SEC_CP:

		vote(chg->pl_disable_votable, PL_SMB_EN_VOTER, true, 0);



		/* select Charge Pump instead of slave charger */

		rc = smblib_masked_write(chg, MISC_SMB_CFG_REG,

					SMB_EN_SEL_BIT, SMB_EN_SEL_BIT);
@@ -158,9 +160,14 @@ static int smblib_select_sec_charger(struct smb_charger *chg, int sec_chg) 
						rc);

			return rc;

		}



		vote(chg->pl_disable_votable, PL_SMB_EN_VOTER, false, 0);



		break;

	case POWER_SUPPLY_CHARGER_SEC_NONE:

	default:

		vote(chg->pl_disable_votable, PL_SMB_EN_VOTER, true, 0);



		/* SW override, disabling secondary charger(s) */

		rc = smblib_write(chg, MISC_SMB_EN_CMD_REG,

						SMB_EN_OVERRIDE_BIT);
@@ -3339,7 +3346,6 @@ static void typec_src_removal(struct smb_charger *chg) 
	vote(chg->usb_icl_votable, PD_VOTER, false, 0);

	vote(chg->usb_icl_votable, USB_PSY_VOTER, false, 0);

	vote(chg->usb_icl_votable, DCP_VOTER, false, 0);

	vote(chg->usb_icl_votable, PL_USBIN_USBIN_VOTER, false, 0);

	vote(chg->usb_icl_votable, SW_QC3_VOTER, false, 0);

	vote(chg->usb_icl_votable, OTG_VOTER, false, 0);

	vote(chg->usb_icl_votable, CTM_VOTER, false, 0);

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

+1 −9
Original line number Diff line number Diff line
@@ -33,22 +33,13 @@ enum print_reason { 
#define PD_VOTER			"PD_VOTER"

#define DCP_VOTER			"DCP_VOTER"

#define QC_VOTER			"QC_VOTER"

#define PL_USBIN_USBIN_VOTER		"PL_USBIN_USBIN_VOTER"

#define USB_PSY_VOTER			"USB_PSY_VOTER"

#define PL_TAPER_WORK_RUNNING_VOTER	"PL_TAPER_WORK_RUNNING_VOTER"

#define PL_QNOVO_VOTER			"PL_QNOVO_VOTER"

#define USBIN_V_VOTER			"USBIN_V_VOTER"

#define CHG_STATE_VOTER			"CHG_STATE_VOTER"

#define TYPEC_SRC_VOTER			"TYPEC_SRC_VOTER"

#define TAPER_END_VOTER			"TAPER_END_VOTER"

#define THERMAL_DAEMON_VOTER		"THERMAL_DAEMON_VOTER"

#define CC_DETACHED_VOTER		"CC_DETACHED_VOTER"

#define APSD_VOTER			"APSD_VOTER"

#define PD_DISALLOWED_INDIRECT_VOTER	"PD_DISALLOWED_INDIRECT_VOTER"

#define VBUS_CC_SHORT_VOTER		"VBUS_CC_SHORT_VOTER"

#define PD_INACTIVE_VOTER		"PD_INACTIVE_VOTER"

#define BOOST_BACK_VOTER		"BOOST_BACK_VOTER"

#define USBIN_USBIN_BOOST_VOTER		"USBIN_USBIN_BOOST_VOTER"

#define MICRO_USB_VOTER			"MICRO_USB_VOTER"

#define DEBUG_BOARD_VOTER		"DEBUG_BOARD_VOTER"

#define PD_SUSPEND_SUPPORTED_VOTER	"PD_SUSPEND_SUPPORTED_VOTER"
@@ -66,6 +57,7 @@ enum print_reason { 
#define PL_FCC_LOW_VOTER		"PL_FCC_LOW_VOTER"

#define WBC_VOTER			"WBC_VOTER"

#define HW_LIMIT_VOTER			"HW_LIMIT_VOTER"

#define PL_SMB_EN_VOTER			"PL_SMB_EN_VOTER"



#define BOOST_BACK_STORM_COUNT	3

#define WEAK_CHG_STORM_COUNT	8