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

Commit ab56dfd6 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sdxprairie: Enable charger and FG drivers"

parents df183022 5d1ef4c7

Documentation/devicetree/bindings/power/supply/qcom/qpnp-smb5.txt

+6 −0
Original line number Diff line number Diff line
@@ -275,6 +275,12 @@ Charger specific properties: 
  Definition: Boolean flag which when present enables hardware-controlled

		operation of HVDCP.



- qcom,usb-pd-disable

  Usage:      optional

  Value type: bool

  Definition: Boolean flag which when present disables USB-PD operation. Not

		applicable for PMI632, where PD is not supported.



=============================================

Second Level Nodes - SMB5 Charger Peripherals

=============================================

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,8 @@ CONFIG_PINCTRL_SDXPRAIRIE=y 
CONFIG_GPIOLIB=y

CONFIG_POWER_RESET=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG_GEN4=y

CONFIG_QPNP_SMB5=y

CONFIG_THERMAL=y

CONFIG_QCOM_SPMI_TEMP_ALARM=y

CONFIG_THERMAL_TSENS=y

arch/arm/configs/vendor/sdxprairie_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ CONFIG_PINCTRL_SDXPRAIRIE=y 
CONFIG_GPIOLIB=y

CONFIG_POWER_RESET=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG_GEN4=y

CONFIG_QPNP_SMB5=y

CONFIG_THERMAL=y

CONFIG_QCOM_SPMI_TEMP_ALARM=y

CONFIG_THERMAL_TSENS=y

arch/arm64/boot/dts/qcom/sdxprairie-mtp.dtsi

+42 −0
Original line number Diff line number Diff line
@@ -173,3 +173,45 @@ 
		thermal-governor = "user_space";

	};

};



&soc {

	sdxprairie_mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "fg-gen4-batterydata-alium-3600mah.dtsi"

	};

};



&pm8150b_charger {

	qcom,sec-charger-config = <0>;

	qcom,auto-recharge-soc = <98>;

	io-channels = <&pm8150b_vadc ADC_MID_CHG_DIV6>,

		      <&pm8150b_vadc ADC_USB_IN_I>,

		      <&pm8150b_vadc ADC_SBUx>,

		      <&pm8150b_vadc ADC_VPH_PWR>,

		      <&pm8150b_vadc ADC_CHG_TEMP>;

	io-channel-names = "mid_voltage",

			   "usb_in_current",

			   "sbux_res",

			   "vph_voltage",

			   "chg_temp";

	qcom,battery-data = <&sdxprairie_mtp_batterydata>;

	qcom,step-charging-enable;

	qcom,wd-bark-time-secs = <16>;

	qcom,suspend-input-on-debug-batt;

	qcom,hvdcp-autonomous-enable;

	qcom,usb-pd-disable;

};



&pm8150b_fg {

	qcom,battery-data = <&sdxprairie_mtp_batterydata>;

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

	qcom,five-pin-battery;

	/* ESR fast calibration */

	qcom,fg-esr-timer-chg-fast = <0 7>;

	qcom,fg-esr-timer-dischg-fast = <0 7>;

	qcom,fg-esr-timer-chg-slow = <0 96>;

	qcom,fg-esr-timer-dischg-slow = <0 96>;

	qcom,fg-esr-cal-soc-thresh = <26 230>;

	qcom,fg-esr-cal-temp-thresh = <10 40>;

};

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

+3 −0
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ static int smb5_parse_dt(struct smb5 *chip) 
	chg->sw_jeita_enabled = of_property_read_bool(node,

				"qcom,sw-jeita-enable");



	chg->pd_not_supported = of_property_read_bool(node,

				"qcom,usb-pd-disable");



	rc = of_property_read_u32(node, "qcom,wd-bark-time-secs",

					&chip->dt.wd_bark_time);

	if (rc < 0 || chip->dt.wd_bark_time < MIN_WD_BARK_TIME)