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

Commit 1d452571 authored by Ashay Jaiswal's avatar Ashay Jaiswal Committed by Guru Das Srinagesh
Browse files

power: smb5-lib: add USBIN_OV de-bounce support 



Add support to de-bounce USBIN_OV signal, during de-bounce
period charger driver reports battery status as CHARGING
if USB is present and input path is not suspended.

Change-Id: I9f34e33ce1a43d6f81f147e02ea1ed36ea5b8318
Signed-off-by: default avatarAshay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: default avatarUmang Agrawal <uagrawal@codeaurora.org>
parent 6397e8df

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

+2 −2
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ static int smb5_chg_config_init(struct smb5 *chip) 
		break;

	case PMI632_SUBTYPE:

		chip->chg.smb_version = PMI632_SUBTYPE;

		chg->wa_flags |= WEAK_ADAPTER_WA;

		chg->wa_flags |= WEAK_ADAPTER_WA | USBIN_OV_WA;

		chg->param = smb5_pmi632_params;

		chg->use_extcon = true;

		chg->name = "pmi632_charger";
@@ -2670,7 +2670,7 @@ static struct smb_irq_info smb5_irqs[] = { 
	},

	[USBIN_OV_IRQ] = {

		.name		= "usbin-ov",

		.handler	= default_irq_handler,

		.handler	= usbin_ov_irq_handler,

	},

	[USBIN_PLUGIN_IRQ] = {

		.name		= "usbin-plugin",

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

+89 −1
Original line number Diff line number Diff line
@@ -1115,6 +1115,11 @@ static void smblib_uusb_removal(struct smb_charger *chg) 
		smblib_err(chg, "Couldn't set USBIN_ADAPTER_ALLOW_5V_OR_9V_TO_12V rc=%d\n",

			rc);



	/* reset USBOV votes and cancel work */

	cancel_delayed_work_sync(&chg->usbov_dbc_work);

	vote(chg->awake_votable, USBOV_DBC_VOTER, false, 0);

	chg->dbc_usbov = false;



	chg->voltage_min_uv = MICRO_5V;

	chg->voltage_max_uv = MICRO_5V;

	chg->usb_icl_delta_ua = 0;
@@ -1738,7 +1743,32 @@ int smblib_get_prop_batt_status(struct smb_charger *chg, 
	union power_supply_propval pval = {0, };

	bool usb_online, dc_online;

	u8 stat;

	int rc;

	int rc, suspend = 0;



	if (chg->dbc_usbov) {

		rc = smblib_get_prop_usb_present(chg, &pval);

		if (rc < 0) {

			smblib_err(chg,

				"Couldn't get usb present prop rc=%d\n", rc);

			return rc;

		}



		rc = smblib_get_usb_suspend(chg, &suspend);

		if (rc < 0) {

			smblib_err(chg,

				"Couldn't get usb suspend rc=%d\n", rc);

			return rc;

		}



		/*

		 * Report charging as long as USBOV is not debounced and

		 * charging path is un-suspended.

		 */

		if (pval.intval && !suspend) {

			val->intval = POWER_SUPPLY_STATUS_CHARGING;

			return 0;

		}

	}



	rc = smblib_get_prop_usb_online(chg, &pval);

	if (rc < 0) {
@@ -5020,6 +5050,11 @@ static void typec_src_removal(struct smb_charger *chg) 
		vote(chg->cp_disable_votable, SW_THERM_REGULATION_VOTER,

								false, 0);



	/* reset USBOV votes and cancel work */

	cancel_delayed_work_sync(&chg->usbov_dbc_work);

	vote(chg->awake_votable, USBOV_DBC_VOTER, false, 0);

	chg->dbc_usbov = false;



	chg->pulse_cnt = 0;

	chg->usb_icl_delta_ua = 0;

	chg->voltage_min_uv = MICRO_5V;
@@ -5468,6 +5503,57 @@ irqreturn_t temp_change_irq_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



static void smblib_usbov_dbc_work(struct work_struct *work)

{

	struct smb_charger *chg = container_of(work, struct smb_charger,

						usbov_dbc_work.work);



	smblib_dbg(chg, PR_MISC, "Resetting USBOV debounce\n");

	chg->dbc_usbov = false;

	vote(chg->awake_votable, USBOV_DBC_VOTER, false, 0);

}



#define USB_OV_DBC_PERIOD_MS		1000

irqreturn_t usbin_ov_irq_handler(int irq, void *data)

{

	struct smb_irq_data *irq_data = data;

	struct smb_charger *chg = irq_data->parent_data;

	u8 stat;

	int rc;



	smblib_dbg(chg, PR_INTERRUPT, "IRQ: %s\n", irq_data->name);



	if (!(chg->wa_flags & USBIN_OV_WA))

		return IRQ_HANDLED;



	rc = smblib_read(chg, USBIN_BASE + INT_RT_STS_OFFSET, &stat);

	if (rc < 0) {

		smblib_err(chg, "Couldn't read USB_INT_RT_STS rc=%d\n", rc);

		return IRQ_HANDLED;

	}



	/*

	 * On specific PMICs, OV IRQ triggers for very small duration in

	 * interim periods affecting charging status reflection. In order to

	 * differentiate between OV IRQ glitch and real OV_IRQ, add a debounce

	 * period for evaluation.

	 */

	if (stat & USBIN_OV_RT_STS_BIT) {

		chg->dbc_usbov = true;

		vote(chg->awake_votable, USBOV_DBC_VOTER, true, 0);

		schedule_delayed_work(&chg->usbov_dbc_work,

				msecs_to_jiffies(USB_OV_DBC_PERIOD_MS));

	} else {

		cancel_delayed_work_sync(&chg->usbov_dbc_work);

		chg->dbc_usbov = false;

		vote(chg->awake_votable, USBOV_DBC_VOTER, false, 0);

	}



	smblib_dbg(chg, PR_MISC, "USBOV debounce status %d\n",

				chg->dbc_usbov);

	return IRQ_HANDLED;

}



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

 * Additional USB PSY getters/setters

 * that call interrupt functions
@@ -6135,6 +6221,7 @@ int smblib_init(struct smb_charger *chg) 
	INIT_DELAYED_WORK(&chg->lpd_detach_work, smblib_lpd_detach_work);

	INIT_DELAYED_WORK(&chg->thermal_regulation_work,

					smblib_thermal_regulation_work);

	INIT_DELAYED_WORK(&chg->usbov_dbc_work, smblib_usbov_dbc_work);



	if (chg->uusb_moisture_protection_enabled) {

		INIT_WORK(&chg->moisture_protection_work,
@@ -6256,6 +6343,7 @@ int smblib_deinit(struct smb_charger *chg) 
		cancel_delayed_work_sync(&chg->lpd_ra_open_work);

		cancel_delayed_work_sync(&chg->lpd_detach_work);

		cancel_delayed_work_sync(&chg->thermal_regulation_work);

		cancel_delayed_work_sync(&chg->usbov_dbc_work);

		power_supply_unreg_notifier(&chg->nb);

		smblib_destroy_votables(chg);

		qcom_step_chg_deinit();

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

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ enum print_reason { 
#define MOISTURE_VOTER			"MOISTURE_VOTER"

#define HVDCP2_ICL_VOTER		"HVDCP2_ICL_VOTER"

#define AICL_THRESHOLD_VOTER		"AICL_THRESHOLD_VOTER"

#define USBOV_DBC_VOTER			"USBOV_DBC_VOTER"



#define BOOST_BACK_STORM_COUNT	3

#define WEAK_CHG_STORM_COUNT	8
@@ -103,6 +104,7 @@ enum { 
	BOOST_BACK_WA			= BIT(0),

	SW_THERM_REGULATION_WA		= BIT(1),

	WEAK_ADAPTER_WA			= BIT(2),

	USBIN_OV_WA			= BIT(3),

};



enum jeita_cfg_stat {
@@ -400,6 +402,7 @@ struct smb_charger { 
	struct delayed_work	lpd_ra_open_work;

	struct delayed_work	lpd_detach_work;

	struct delayed_work	thermal_regulation_work;

	struct delayed_work	usbov_dbc_work;



	struct alarm		lpd_recheck_timer;

	struct alarm		moisture_protection_alarm;
@@ -488,6 +491,7 @@ struct smb_charger { 
	int			boost_current_ua;

	int                     qc2_max_pulses;

	enum qc2_non_comp_voltage qc2_unsupported_voltage;

	bool			dbc_usbov;



	/* extcon for VBUS / ID notification to USB for uUSB */

	struct extcon_dev	*extcon;
@@ -566,6 +570,7 @@ irqreturn_t wdog_snarl_irq_handler(int irq, void *data); 
irqreturn_t wdog_bark_irq_handler(int irq, void *data);

irqreturn_t typec_or_rid_detection_change_irq_handler(int irq, void *data);

irqreturn_t temp_change_irq_handler(int irq, void *data);

irqreturn_t usbin_ov_irq_handler(int irq, void *data);



int smblib_get_prop_input_suspend(struct smb_charger *chg,

				union power_supply_propval *val);