Merge "power: smb5: Disable wdog-bark IRQ on wdog-snarl" (fca42087) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -2555,13 +2555,15 @@ static int smb5_init_hw(struct smb5 *chip)
		return rc;
		}

		val = WDOG_TIMER_EN_ON_PLUGIN_BIT;
		if (chip->dt.wd_snarl_time_cfg == -EINVAL)
		val \|= BARK_WDOG_INT_EN_BIT;

		/* enable WD BARK and enable it on plugin */
		rc = smblib_masked_write(chg, WD_CFG_REG,
		WATCHDOG_TRIGGER_AFP_EN_BIT \|
		WDOG_TIMER_EN_ON_PLUGIN_BIT \|
		BARK_WDOG_INT_EN_BIT,
		WDOG_TIMER_EN_ON_PLUGIN_BIT \|
		BARK_WDOG_INT_EN_BIT);
		BARK_WDOG_INT_EN_BIT, val);
		if (rc < 0) {
		pr_err("Couldn't configue WD config rc=%d\n", rc);
		return rc;

+0 −6

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ struct step_chg_info {
		struct power_supply *batt_psy;
		struct power_supply *bms_psy;
		struct power_supply *usb_psy;
		struct power_supply *main_psy;
		struct power_supply *dc_psy;
		struct delayed_work status_change_work;
		struct delayed_work get_config_work;
		@@ -723,11 +722,6 @@ static int handle_jeita(struct step_chg_info *chip)
		update_time:
		chip->jeita_last_update_time = ktime_get();

		if (!chip->main_psy)
		chip->main_psy = power_supply_get_by_name("main");
		if (chip->main_psy)
		power_supply_changed(chip->main_psy);

		return 0;
		}