Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 193ba99a authored by Abhijeet Dharmapurikar's avatar Abhijeet Dharmapurikar
Browse files

power: qpnp-smbcharger: rearrange the power supply callbacks 



Move the power supply callback functions right above the interrupt
handlers.

Change-Id: Ided7ea1f4be18a3d846fbe9599dd31290fb32e29
Signed-off-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
parent be7dc2af

drivers/power/qpnp-smbcharger.c

+249 −249
Original line number Diff line number Diff line
@@ -705,29 +705,6 @@ static void read_usb_type(struct smbchg_chip *chip, char **usb_type_name, 
	*usb_supply_type = get_usb_supply_type(type);

}



static enum power_supply_property smbchg_battery_properties[] = {

	POWER_SUPPLY_PROP_STATUS,

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGE_TYPE,

	POWER_SUPPLY_PROP_CAPACITY,

	POWER_SUPPLY_PROP_HEALTH,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL,

	POWER_SUPPLY_PROP_FLASH_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,

	POWER_SUPPLY_PROP_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,

	POWER_SUPPLY_PROP_CURRENT_NOW,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_VOLTAGE_NOW,

	POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE,

	POWER_SUPPLY_PROP_INPUT_CURRENT_MAX,

	POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED,

	POWER_SUPPLY_PROP_FLASH_ACTIVE,

};



#define CHGR_STS			0x0E

#define BATT_LESS_THAN_2V		BIT(4)

#define CHG_HOLD_OFF_BIT		BIT(3)
@@ -2741,232 +2718,6 @@ static int smbchg_force_tlim_en(struct smbchg_chip *chip, bool enable) 
	return rc;

}



static int smbchg_battery_set_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       const union power_supply_propval *val)

{

	int rc = 0;

	bool unused;

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, batt_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED:

		smbchg_battchg_en(chip, val->intval,

				REASON_BATTCHG_USER, &unused);

		break;

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		smbchg_usb_en(chip, val->intval, REASON_USER);

		smbchg_dc_en(chip, val->intval, REASON_USER);

		chip->chg_enabled = val->intval;

		schedule_work(&chip->usb_set_online_work);

		break;

	case POWER_SUPPLY_PROP_CAPACITY:

		chip->fake_battery_soc = val->intval;

		power_supply_changed(&chip->batt_psy);

		break;

	case POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL:

		smbchg_system_temp_level_set(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

		rc = smbchg_set_fastchg_current_user(chip, val->intval / 1000);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		rc = smbchg_float_voltage_set(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE:

		rc = smbchg_safety_timer_enable(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_FLASH_ACTIVE:

		rc = smbchg_otg_pulse_skip_enable(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_FORCE_TLIM:

		rc = smbchg_force_tlim_en(chip, val->intval);

		break;

	default:

		return -EINVAL;

	}



	return rc;

}



static int smbchg_battery_is_writeable(struct power_supply *psy,

				       enum power_supply_property prop)

{

	int rc;



	switch (prop) {

	case POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED:

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

	case POWER_SUPPLY_PROP_CAPACITY:

	case POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL:

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

	case POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE:

		rc = 1;

		break;

	default:

		rc = 0;

		break;

	}

	return rc;

}



static int smbchg_battery_get_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       union power_supply_propval *val)

{

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, batt_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_STATUS:

		val->intval = get_prop_batt_status(chip);

		break;

	case POWER_SUPPLY_PROP_PRESENT:

		val->intval = get_prop_batt_present(chip);

		break;

	case POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED:

		val->intval = smcghg_is_battchg_en(chip, REASON_BATTCHG_USER);

		break;

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		val->intval = chip->chg_enabled;

		break;

	case POWER_SUPPLY_PROP_CHARGE_TYPE:

		val->intval = get_prop_charge_type(chip);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		val->intval = smbchg_float_voltage_get(chip);

		break;

	case POWER_SUPPLY_PROP_HEALTH:

		val->intval = get_prop_batt_health(chip);

		break;

	case POWER_SUPPLY_PROP_TECHNOLOGY:

		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;

		break;

	case POWER_SUPPLY_PROP_FLASH_CURRENT_MAX:

		val->intval = smbchg_calc_max_flash_current(chip);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

		val->intval = chip->fastchg_current_ma * 1000;

		break;

	case POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL:

		val->intval = chip->therm_lvl_sel;

		break;

	case POWER_SUPPLY_PROP_INPUT_CURRENT_MAX:

		val->intval = smbchg_get_aicl_level_ma(chip) * 1000;

		break;

	case POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED:

		val->intval = (int)chip->aicl_complete;

		break;

	/* properties from fg */

	case POWER_SUPPLY_PROP_CAPACITY:

		val->intval = get_prop_batt_capacity(chip);

		break;

	case POWER_SUPPLY_PROP_CURRENT_NOW:

		val->intval = get_prop_batt_current_now(chip);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		val->intval = get_prop_batt_voltage_now(chip);

		break;

	case POWER_SUPPLY_PROP_TEMP:

		val->intval = get_prop_batt_temp(chip);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:

		val->intval = get_prop_batt_voltage_max_design(chip);

		break;

	case POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE:

		val->intval = chip->safety_timer_en;

		break;

	case POWER_SUPPLY_PROP_FLASH_ACTIVE:

		val->intval = chip->otg_pulse_skip_en;

		break;

	default:

		return -EINVAL;

	}

	return 0;

}



static char *smbchg_dc_supplicants[] = {

	"bms",

};



static enum power_supply_property smbchg_dc_properties[] = {

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CURRENT_MAX,

};



static int smbchg_dc_set_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       const union power_supply_propval *val)

{

	int rc = 0;

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, dc_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		rc = smbchg_dc_en(chip, val->intval, REASON_POWER_SUPPLY);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smbchg_set_dc_current_max(chip, val->intval / 1000);

		break;

	default:

		return -EINVAL;

	}



	return rc;

}



static int smbchg_dc_get_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       union power_supply_propval *val)

{

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, dc_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_PRESENT:

		val->intval = is_dc_present(chip);

		break;

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		val->intval = chip->dc_suspended == 0;

		break;

	case POWER_SUPPLY_PROP_ONLINE:

		/* return if dc is charging the battery */

		val->intval = (smbchg_get_pwr_path(chip) == PWR_PATH_DC)

				&& (get_prop_batt_status(chip)

					== POWER_SUPPLY_STATUS_CHARGING);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		val->intval = chip->dc_max_current_ma * 1000;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}



static int smbchg_dc_is_writeable(struct power_supply *psy,

				       enum power_supply_property prop)

{

	int rc;



	switch (prop) {

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = 1;

		break;

	default:

		rc = 0;

		break;

	}

	return rc;

}



static void smbchg_vfloat_adjust_check(struct smbchg_chip *chip)

{

	if (!chip->use_vfloat_adjustments)
@@ -4339,6 +4090,255 @@ static void increment_aicl_count(struct smbchg_chip *chip) 
	}

}



static enum power_supply_property smbchg_battery_properties[] = {

	POWER_SUPPLY_PROP_STATUS,

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CHARGE_TYPE,

	POWER_SUPPLY_PROP_CAPACITY,

	POWER_SUPPLY_PROP_HEALTH,

	POWER_SUPPLY_PROP_TECHNOLOGY,

	POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL,

	POWER_SUPPLY_PROP_FLASH_CURRENT_MAX,

	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,

	POWER_SUPPLY_PROP_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,

	POWER_SUPPLY_PROP_CURRENT_NOW,

	POWER_SUPPLY_PROP_TEMP,

	POWER_SUPPLY_PROP_VOLTAGE_NOW,

	POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE,

	POWER_SUPPLY_PROP_INPUT_CURRENT_MAX,

	POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED,

	POWER_SUPPLY_PROP_FLASH_ACTIVE,

};



static int smbchg_battery_set_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       const union power_supply_propval *val)

{

	int rc = 0;

	bool unused;

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, batt_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED:

		smbchg_battchg_en(chip, val->intval,

				REASON_BATTCHG_USER, &unused);

		break;

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		smbchg_usb_en(chip, val->intval, REASON_USER);

		smbchg_dc_en(chip, val->intval, REASON_USER);

		chip->chg_enabled = val->intval;

		schedule_work(&chip->usb_set_online_work);

		break;

	case POWER_SUPPLY_PROP_CAPACITY:

		chip->fake_battery_soc = val->intval;

		power_supply_changed(&chip->batt_psy);

		break;

	case POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL:

		smbchg_system_temp_level_set(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

		rc = smbchg_set_fastchg_current_user(chip, val->intval / 1000);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		rc = smbchg_float_voltage_set(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE:

		rc = smbchg_safety_timer_enable(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_FLASH_ACTIVE:

		rc = smbchg_otg_pulse_skip_enable(chip, val->intval);

		break;

	case POWER_SUPPLY_PROP_FORCE_TLIM:

		rc = smbchg_force_tlim_en(chip, val->intval);

		break;

	default:

		return -EINVAL;

	}



	return rc;

}



static int smbchg_battery_is_writeable(struct power_supply *psy,

				       enum power_supply_property prop)

{

	int rc;



	switch (prop) {

	case POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED:

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

	case POWER_SUPPLY_PROP_CAPACITY:

	case POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL:

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

	case POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE:

		rc = 1;

		break;

	default:

		rc = 0;

		break;

	}

	return rc;

}



static int smbchg_battery_get_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       union power_supply_propval *val)

{

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, batt_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_STATUS:

		val->intval = get_prop_batt_status(chip);

		break;

	case POWER_SUPPLY_PROP_PRESENT:

		val->intval = get_prop_batt_present(chip);

		break;

	case POWER_SUPPLY_PROP_BATTERY_CHARGING_ENABLED:

		val->intval = smcghg_is_battchg_en(chip, REASON_BATTCHG_USER);

		break;

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		val->intval = chip->chg_enabled;

		break;

	case POWER_SUPPLY_PROP_CHARGE_TYPE:

		val->intval = get_prop_charge_type(chip);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		val->intval = smbchg_float_voltage_get(chip);

		break;

	case POWER_SUPPLY_PROP_HEALTH:

		val->intval = get_prop_batt_health(chip);

		break;

	case POWER_SUPPLY_PROP_TECHNOLOGY:

		val->intval = POWER_SUPPLY_TECHNOLOGY_LION;

		break;

	case POWER_SUPPLY_PROP_FLASH_CURRENT_MAX:

		val->intval = smbchg_calc_max_flash_current(chip);

		break;

	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:

		val->intval = chip->fastchg_current_ma * 1000;

		break;

	case POWER_SUPPLY_PROP_SYSTEM_TEMP_LEVEL:

		val->intval = chip->therm_lvl_sel;

		break;

	case POWER_SUPPLY_PROP_INPUT_CURRENT_MAX:

		val->intval = smbchg_get_aicl_level_ma(chip) * 1000;

		break;

	case POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED:

		val->intval = (int)chip->aicl_complete;

		break;

	/* properties from fg */

	case POWER_SUPPLY_PROP_CAPACITY:

		val->intval = get_prop_batt_capacity(chip);

		break;

	case POWER_SUPPLY_PROP_CURRENT_NOW:

		val->intval = get_prop_batt_current_now(chip);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		val->intval = get_prop_batt_voltage_now(chip);

		break;

	case POWER_SUPPLY_PROP_TEMP:

		val->intval = get_prop_batt_temp(chip);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:

		val->intval = get_prop_batt_voltage_max_design(chip);

		break;

	case POWER_SUPPLY_PROP_SAFETY_TIMER_ENABLE:

		val->intval = chip->safety_timer_en;

		break;

	case POWER_SUPPLY_PROP_FLASH_ACTIVE:

		val->intval = chip->otg_pulse_skip_en;

		break;

	default:

		return -EINVAL;

	}

	return 0;

}



static char *smbchg_dc_supplicants[] = {

	"bms",

};



static enum power_supply_property smbchg_dc_properties[] = {

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_CHARGING_ENABLED,

	POWER_SUPPLY_PROP_CURRENT_MAX,

};



static int smbchg_dc_set_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       const union power_supply_propval *val)

{

	int rc = 0;

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, dc_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		rc = smbchg_dc_en(chip, val->intval, REASON_POWER_SUPPLY);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smbchg_set_dc_current_max(chip, val->intval / 1000);

		break;

	default:

		return -EINVAL;

	}



	return rc;

}



static int smbchg_dc_get_property(struct power_supply *psy,

				       enum power_supply_property prop,

				       union power_supply_propval *val)

{

	struct smbchg_chip *chip = container_of(psy,

				struct smbchg_chip, dc_psy);



	switch (prop) {

	case POWER_SUPPLY_PROP_PRESENT:

		val->intval = is_dc_present(chip);

		break;

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

		val->intval = chip->dc_suspended == 0;

		break;

	case POWER_SUPPLY_PROP_ONLINE:

		/* return if dc is charging the battery */

		val->intval = (smbchg_get_pwr_path(chip) == PWR_PATH_DC)

				&& (get_prop_batt_status(chip)

					== POWER_SUPPLY_STATUS_CHARGING);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		val->intval = chip->dc_max_current_ma * 1000;

		break;

	default:

		return -EINVAL;

	}



	return 0;

}



static int smbchg_dc_is_writeable(struct power_supply *psy,

				       enum power_supply_property prop)

{

	int rc;



	switch (prop) {

	case POWER_SUPPLY_PROP_CHARGING_ENABLED:

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = 1;

		break;

	default:

		rc = 0;

		break;

	}

	return rc;

}



#define HOT_BAT_HARD_BIT	BIT(0)

#define HOT_BAT_SOFT_BIT	BIT(1)

#define COLD_BAT_HARD_BIT	BIT(2)