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

Commit 06332ef4 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-fg: print the battery id upon profile load"

parents c07fca60 af2c4534

drivers/power/qpnp-fg.c

+3 −0
Original line number Diff line number Diff line
@@ -4326,6 +4326,9 @@ wait: 
		goto no_profile;

	}



	if (fg_debug_mask & FG_STATUS)

		pr_info("battery id = %d\n",

				get_sram_prop_now(chip, FG_DATA_BATT_ID));

	profile_node = of_batterydata_get_best_profile(batt_node, "bms",

							fg_batt_type);

	if (!profile_node) {

drivers/power/qpnp-smbcharger.c

+14 −10
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ static void read_usb_type(struct smbchg_chip *chip, char **usb_type_name, 
#define BATT_PRE_CHG_VAL		0x1

#define BATT_FAST_CHG_VAL		0x2

#define BATT_TAPER_CHG_VAL		0x3

#define CHG_EN_BIT			BIT(0)

#define CHG_INHIBIT_BIT			BIT(1)

#define BAT_TCC_REACHED_BIT		BIT(7)

static int get_prop_batt_status(struct smbchg_chip *chip)
@@ -5556,7 +5555,7 @@ static inline int get_bpd(const char *name) 
#define CHG_INHIBIT_MASK		0x03

#define USE_REGISTER_FOR_CURRENT	BIT(2)

#define CHG_EN_SRC_BIT			BIT(7)

#define CHG_EN_COMMAND_BIT		BIT(6)

#define CHG_EN_POLARITY_BIT		BIT(6)

#define P2F_CHG_TRAN			BIT(5)

#define I_TERM_BIT			BIT(3)

#define AUTO_RECHG_BIT			BIT(2)
@@ -5688,15 +5687,25 @@ static int smbchg_hw_init(struct smbchg_chip *chip) 
	 * the device tree configuration.

	 */

	rc = smbchg_sec_masked_write(chip, chip->chgr_base + CHGR_CFG2,

			CHG_EN_SRC_BIT | CHG_EN_COMMAND_BIT | P2F_CHG_TRAN

			CHG_EN_SRC_BIT | CHG_EN_POLARITY_BIT | P2F_CHG_TRAN

			| I_TERM_BIT | AUTO_RECHG_BIT | CHARGER_INHIBIT_BIT,

			CHG_EN_COMMAND_BIT

			CHG_EN_POLARITY_BIT

			| (chip->chg_inhibit_en ? CHARGER_INHIBIT_BIT : 0)

			| (chip->iterm_disabled ? I_TERM_BIT : 0));

	if (rc < 0) {

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

		return rc;

	}



	/*

	 * enable battery charging to make sure it hasn't been changed earlier

	 * by the bootloader.

	 */

	rc = smbchg_charging_en(chip, true);

	if (rc < 0) {

		dev_err(chip->dev, "Couldn't enable battery charging=%d\n", rc);

		return rc;

	}

	chip->battchg_disabled = 0;



	/*
@@ -5884,11 +5893,6 @@ static int smbchg_hw_init(struct smbchg_chip *chip) 


	smbchg_charging_status_change(chip);



	/*

	 * The charger needs 20 milliseconds to go into battery supplementary

	 * mode. Sleep here until we are sure it takes into effect.

	 */

	msleep(20);

	smbchg_usb_en(chip, chip->chg_enabled, REASON_USER);

	smbchg_dc_en(chip, chip->chg_enabled, REASON_USER);

	/* resume threshold */