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

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

Merge changes If2cb383b,Ie8100177 into msm-4.14 

* changes:
  power: smb5: Enable AICL rerun
  ARM: dts: msm: Remove some unused interrupts for PM855B charger
parents 9aca2508 46b35fdc

arch/arm64/boot/dts/qcom/pm855b.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
					<0x2 0x10 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x10 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x10 0x7 IRQ_TYPE_LEVEL_HIGH>;
@@ -95,7 +94,6 @@ 
						  "step-chg-state-change",

						  "step-chg-soc-update-fail",

						  "step-chg-soc-update-req",

						  "fg-fvcal-qualified",

						  "vph-alarm",

						  "vph-drop-prechg";

			};
@@ -106,7 +104,6 @@ 
					<0x2 0x11 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x11 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x11 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x11 0x5 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x11 0x6 IRQ_TYPE_EDGE_RISING>,
@@ -115,7 +112,6 @@ 
				interrupt-names = "otg-fail",

						  "otg-oc-disable-sw",

						  "otg-oc-hiccup",

						  "bsm-active",

						  "high-duty-cycle",

						  "input-current-limiting",

						  "concurrent-mode-disable",
@@ -126,7 +122,6 @@ 
				reg = <0x1200 0x100>;

				interrupts =

					<0x2 0x12 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x12 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x12 0x2 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x12 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x12 0x4 IRQ_TYPE_LEVEL_HIGH>,
@@ -135,7 +130,6 @@ 
					<0x2 0x12 0x7 IRQ_TYPE_LEVEL_HIGH>;



				interrupt-names = "bat-temp",

						  "all-chnl-conv-done",

						  "bat-ov",

						  "bat-low",

						  "bat-therm-or-id-missing",
@@ -216,7 +210,6 @@ 
					<0x2 0x16 0x2 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x16 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x16 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x2 0x16 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x2 0x16 0x6 IRQ_TYPE_EDGE_FALLING>,

					<0x2 0x16 0x7 IRQ_TYPE_EDGE_RISING>;
@@ -225,7 +218,6 @@ 
						  "aicl-fail",

						  "aicl-done",

						  "smb-en",

						  "imp-trigger",

						  "temp-change",

						  "temp-change-smb";

			};

drivers/power/supply/qcom/qpnp-smb5.c

+11 −2
Original line number Diff line number Diff line
@@ -1447,15 +1447,24 @@ static int smb5_init_hw(struct smb5 *chip) 


	/*

	 * AICL configuration:

	 * start from min and AICL ADC disable

	 * start from min and AICL ADC disable, and enable aicl rerun

	 */

	rc = smblib_masked_write(chg, USBIN_AICL_OPTIONS_CFG_REG,

				USBIN_AICL_ADC_EN_BIT, 0);

		USBIN_AICL_PERIODIC_RERUN_EN_BIT | USBIN_AICL_ADC_EN_BIT,

		USBIN_AICL_PERIODIC_RERUN_EN_BIT);

	if (rc < 0) {

		dev_err(chg->dev, "Couldn't configure AICL rc=%d\n", rc);

		return rc;

	}



	rc = smblib_write(chg, AICL_RERUN_TIME_CFG_REG,

				AICL_RERUN_TIME_12S_VAL);

	if (rc < 0) {

		dev_err(chg->dev,

			"Couldn't configure AICL rerun interval rc=%d\n", rc);

		return rc;

	}



	/* enable the charging path */

	rc = vote(chg->chg_disable_votable, DEFAULT_VOTER, false, 0);

	if (rc < 0) {

drivers/power/supply/qcom/smb5-reg.h

+4 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ enum { 
#define USBIN_CURRENT_LIMIT_CFG_REG		(USBIN_BASE + 0x70)



#define USBIN_AICL_OPTIONS_CFG_REG		(USBIN_BASE + 0x80)

#define USBIN_AICL_PERIODIC_RERUN_EN_BIT	BIT(4)

#define USBIN_AICL_ADC_EN_BIT			BIT(3)



/********************************
@@ -352,6 +353,9 @@ enum { 
#define BARK_WDOG_INT_EN_BIT			BIT(6)

#define WDOG_TIMER_EN_ON_PLUGIN_BIT		BIT(1)



#define AICL_RERUN_TIME_CFG_REG			(MISC_BASE + 0x61)

#define AICL_RERUN_TIME_12S_VAL			0x01



#define MISC_SMB_CFG_REG			(MISC_BASE + 0x90)

#define SMB_EN_SEL_BIT				BIT(4)

#define CP_EN_POLARITY_CFG_BIT			BIT(3)