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

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

Merge "power: smb5: always parse USBIN_V channel"

parents 49116016 b4281cbd

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

+4 −2
Original line number Diff line number Diff line
@@ -195,12 +195,14 @@ 
		      <&pm8150b_vadc ADC_USB_IN_I>,

		      <&pm8150b_vadc ADC_SBUx>,

		      <&pm8150b_vadc ADC_VPH_PWR>,

		      <&pm8150b_vadc ADC_CHG_TEMP>;

		      <&pm8150b_vadc ADC_CHG_TEMP>,

		      <&pm8150b_vadc ADC_USB_IN_V_16>;

	io-channel-names = "mid_voltage",

			   "usb_in_current",

			   "sbux_res",

			   "vph_voltage",

			   "chg_temp";

			   "chg_temp",

			   "usb_in_voltage";

	qcom,battery-data = <&sdxprairie_mtp_batterydata>;

	qcom,step-charging-enable;

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

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

+4 −2
Original line number Diff line number Diff line
@@ -195,12 +195,14 @@ 
		      <&pm8150b_vadc ADC_USB_IN_I>,

		      <&pm8150b_vadc ADC_SBUx>,

		      <&pm8150b_vadc ADC_VPH_PWR>,

		      <&pm8150b_vadc ADC_CHG_TEMP>;

		      <&pm8150b_vadc ADC_CHG_TEMP>,

		      <&pm8150b_vadc ADC_USB_IN_V_16>;

	io-channel-names = "mid_voltage",

			   "usb_in_current",

			   "sbux_res",

			   "vph_voltage",

			   "chg_temp";

			   "chg_temp",

			   "usb_in_voltage";

	qcom,battery-data = <&sdxprairie_mtp_batterydata>;

	qcom,step-charging-enable;

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

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

+4 −2
Original line number Diff line number Diff line
@@ -625,12 +625,14 @@ 
		      <&pm8150b_vadc ADC_USB_IN_I>,

		      <&pm8150b_vadc ADC_SBUx>,

		      <&pm8150b_vadc ADC_VPH_PWR>,

		      <&pm8150b_vadc ADC_CHG_TEMP>;

		      <&pm8150b_vadc ADC_CHG_TEMP>,

		      <&pm8150b_vadc ADC_USB_IN_V_16>;

	io-channel-names = "mid_voltage",

			   "usb_in_current",

			   "sbux_res",

			   "vph_voltage",

			   "chg_temp";

			   "chg_temp",

			   "usb_in_voltage";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -593,12 +593,14 @@ 
		      <&pm8150b_vadc ADC_USB_IN_I>,

		      <&pm8150b_vadc ADC_SBUx>,

		      <&pm8150b_vadc ADC_VPH_PWR>,

		      <&pm8150b_vadc ADC_CHG_TEMP>;

		      <&pm8150b_vadc ADC_CHG_TEMP>,

		      <&pm8150b_vadc ADC_USB_IN_V_16>;

	io-channel-names = "mid_voltage",

			   "usb_in_current",

			   "sbux_res",

			   "vph_voltage",

			   "chg_temp";

			   "chg_temp",

			   "usb_in_voltage";

	qcom,battery-data = <&qrd_batterydata>;

	qcom,sw-jeita-enable;

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

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

+4 −11
Original line number Diff line number Diff line
@@ -564,18 +564,11 @@ static int smb5_parse_dt(struct smb5 *chip) 
	if (rc < 0)

		return rc;



	if (!chg->iio.mid_chan) {

	rc = smblib_get_iio_channel(chg, "usb_in_voltage",

					&chg->iio.usbin_v_chan);

	if (rc < 0)

		return rc;



		if (!chg->iio.usbin_v_chan) {

			dev_err(chg->dev, "No voltage channel defined");

			return -EINVAL;

		}

	}



	rc = smblib_get_iio_channel(chg, "chg_temp", &chg->iio.temp_chan);

	if (rc < 0)

		return rc;