Merge "regulator: cpr3-regulator: conditionally enable thread aggregation for CPRh" into msm-4.9 (fa403c81) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/regulator/cpr3-regulator.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1382,6 +1382,11 @@ static int cpr3_regulator_init_cprh(struct cpr3_controller *ctrl)
	(ctrl->use_dynamic_step_quot		(ctrl->use_dynamic_step_quot
	? CPR4_MARGIN_ADJ_CTL_PER_RO_KV_MARGIN_EN : 0));		? CPR4_MARGIN_ADJ_CTL_PER_RO_KV_MARGIN_EN : 0));

			if (ctrl->thread_count > 1)
			cpr3_masked_write(ctrl, CPR4_REG_CPR_TIMER_CLAMP,
			CPR4_CPR_TIMER_CLAMP_THREAD_AGGREGATION_EN,
			CPR4_CPR_TIMER_CLAMP_THREAD_AGGREGATION_EN);

	if (ctrl->voltage_settling_time) {		if (ctrl->voltage_settling_time) {
	/*		/*
	* Configure the settling timer used to account for		* Configure the settling timer used to account for