Merge "power: smb1390: Override ILIM in taper only for CC mode"

		smb1390_dbg(chip, PR_INFO, "Set Master ILIM to MAX, post Slave disable in taper, fcc=%d\n",

									fcc_uA);

		vote_override(chip->ilim_votable, CC_MODE_VOTER,

						true, MAX_ILIM_DUAL_CP_UA);

				smb1390_is_adapter_cc_mode(chip),

				MAX_ILIM_DUAL_CP_UA);

		if (chip->usb_icl_votable)

			vote_override(chip->usb_icl_votable,

				      TAPER_MAIN_ICL_LIMIT_VOTER,

				      true, chip->cc_mode_taper_main_icl_ua);

				      smb1390_is_adapter_cc_mode(chip),

				      chip->cc_mode_taper_main_icl_ua);

	}

	return rc;