Merge "power: smb1360: Add a property to disable ov-ends-chg-cycle"

- qcom,iterm-disabled		Disables the termination current feature. This is a bool

				property.

- qcom,chg-inhibit-disabled	Disables the charger-inhibit function.

- qcom,disable-ov-ends-chg-cycle

				The boolean property to indicate if the ov-ends-charge-cycle

				feature is disabled. If the feature is disabled, charging

				could be resumed from battery OV (over voltage) status; otherwise,

				charging cycle will be terminated after battery OV event and

				won't be resumed until disable/enable charging.

- qcom,batt-id-disabled		Disabled the batt-id function. Doing this will

				disable the ability of RID based battery profile selection.

- qcom,fg-delta-soc		The delta in SOC which will generate an interrupt

#define CHG_EN_BY_PIN_BIT		BIT(7)

#define CHG_EN_ACTIVE_LOW_BIT		BIT(6)

#define PRE_TO_FAST_REQ_CMD_BIT		BIT(5)

#define CFG_BAT_OV_ENDS_CHG_CYC		BIT(4)

#define CHG_CURR_TERM_DIS_BIT		BIT(3)

#define CFG_AUTO_RECHG_DIS_BIT		BIT(2)

#define CFG_CHG_INHIBIT_EN_BIT		BIT(0)

	bool				shdn_after_pwroff;

	bool				config_hard_thresholds;

	bool				soft_jeita_supported;

	bool				ov_ends_chg_cycle_disabled;

	int				iterm_ma;

	int				vfloat_mv;

	int				safety_time;

		return rc;

	}

	rc = smb1360_masked_write(chip, CFG_CHG_MISC_REG,

					CFG_BAT_OV_ENDS_CHG_CYC,

					chip->ov_ends_chg_cycle_disabled ?

					0 : CFG_BAT_OV_ENDS_CHG_CYC);

	if (rc) {

		dev_err(chip->dev, "Couldn't set bat_ov_ends_charge rc = %d\n"

									, rc);

		return rc;

	}

	/* battery missing detection */

	rc = smb1360_masked_write(chip, CFG_BATT_MISSING_REG,

				BATT_MISSING_SRC_THERM_BIT,

	chip->min_icl_usb100 = of_property_read_bool(node,

						"qcom,min-icl-100ma");

	chip->ov_ends_chg_cycle_disabled = of_property_read_bool(node,

					"qcom,disable-ov-ends-chg-cycle");

	rc = smb1360_parse_parallel_charging_params(chip);

	if (rc) {

		pr_err("Couldn't parse parallel charginng params rc=%d\n", rc);