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

Commit e6112e1c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: qpnp-smbcharger: Read the hi-power property"

parents 5cef33a2 ed104fad

drivers/power/qpnp-fg.c

+3 −0
Original line number Diff line number Diff line
@@ -2705,6 +2705,9 @@ static int fg_power_get_property(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_CHARGE_NOW_RAW:

		val->intval = get_sram_prop_now(chip, FG_DATA_CC_CHARGE);

		break;

	case POWER_SUPPLY_PROP_HI_POWER:

		val->intval = !!chip->bcl_lpm_disabled;

		break;

	default:

		return -EINVAL;

	}

drivers/power/qpnp-smbcharger.c

+1 −1
Original line number Diff line number Diff line
@@ -6857,7 +6857,7 @@ static int smbchg_hw_init(struct smbchg_chip *chip) 


	/* battery missing detection */

	mask =  BATT_MISSING_ALGO_BIT;

	reg = chip->bmd_algo_disabled ? BATT_MISSING_ALGO_BIT : 0;

	reg = chip->bmd_algo_disabled ? 0 : BATT_MISSING_ALGO_BIT;

	if (chip->bmd_pin_src < BPD_TYPE_DEFAULT) {

		mask |= BMD_PIN_SRC_MASK;

		reg |= chip->bmd_pin_src << PIN_SRC_SHIFT;