Merge "power: smb1355-charger: Update the WD BITE timeout to 8secs" (1c72d008) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -1197,6 +1197,16 @@ static int smb1355_init_hw(struct smb1355 *chip)
		return rc;
		}

		/* disable charging when watchdog bites & set bite-timeout to 8secs */
		val = BITE_WDOG_DISABLE_CHARGING_CFG_BIT \| 0x3;
		rc = smb1355_masked_write(chip, SNARL_BARK_BITE_WD_CFG_REG,
		BITE_WDOG_DISABLE_CHARGING_CFG_BIT \|
		BITE_WDOG_TIMEOUT_MASK, val);
		if (rc < 0) {
		pr_err("Couldn't configure the watchdog bite rc=%d\n", rc);
		return rc;
		}

		/* enable watchdog bark and bite interrupts, and disable the watchdog */
		rc = smb1355_masked_write(chip, WD_CFG_REG, WDOG_TIMER_EN_BIT
		\| WDOG_TIMER_EN_ON_PLUGIN_BIT \| BITE_WDOG_INT_EN_BIT
		@@ -1207,15 +1217,6 @@ static int smb1355_init_hw(struct smb1355 *chip)
		return rc;
		}

		/* disable charging when watchdog bites */
		rc = smb1355_masked_write(chip, SNARL_BARK_BITE_WD_CFG_REG,
		BITE_WDOG_DISABLE_CHARGING_CFG_BIT,
		BITE_WDOG_DISABLE_CHARGING_CFG_BIT);
		if (rc < 0) {
		pr_err("Couldn't configure the watchdog bite rc=%d\n", rc);
		return rc;
		}

		/*
		* Disable command based SMB1355 enablement and disable parallel
		* charging path by switching to command based mode.