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

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

Merge "ARM: dts: msm: Add dpdm regulator and batterydata node to sm6150"

parents 28b0f7af 23f5af0c

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

+36 −0
Original line number Diff line number Diff line
@@ -384,6 +384,42 @@ 
						 <12000 2250>; /* 12V @ 2.25A */

		};



		pm6150_qg: qpnp,qg {

			compatible = "qcom,qpnp-qg";

			#address-cells = <1>;

			#size-cells = <1>;



			qcom,qg-iterm-ma = <100>;

			qcom,hold-soc-while-full;

			qcom,linearize-soc;

			qcom,pmic-revid = <&pm6150_revid>;

			io-channels = <&pm6150_vadc ADC_BAT_THERM_PU2>,

				      <&pm6150_vadc ADC_BAT_ID_PU2>;

			io-channel-names = "batt-therm",

					   "batt-id";



			qcom,qgauge@4800 {

				status = "okay";

				reg = <0x4800 0x100>;

				interrupts =

					<0x0 0x48 0x0 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x48 0x1 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x48 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x48 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x48 0x4 IRQ_TYPE_EDGE_RISING>;

				interrupt-names = "qg-batt-missing",

						  "qg-vbat-low",

						  "qg-vbat-empty",

						  "qg-fifo-done",

						  "qg-good-ocv";

			};



			qcom,qg-sdam@b500 {

				status = "okay";

				reg = <0xb500 0x100>;

			};

		};



		pm6150_bcl: bcl@1d00 {

			compatible = "qcom,bcl-v5";

			reg = <0x1d00 0x100>;

arch/arm64/boot/dts/qcom/sm6150-idp.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -10,9 +10,18 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/iio/qcom,spmi-vadc.h>



&soc {

};



/ {

	mtp_batterydata: qcom,battery-data {

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

		#include "qg-batterydata-alium-3600mah.dtsi"

	};

};



&qupv3_se0_2uart {

	status = "ok";

};
@@ -89,3 +98,19 @@ 


	status = "ok";

};



&pm6150_qg {

	qcom,battery-data = <&mtp_batterydata>;

};



&pm6150_charger {

	io-channels = <&pm6150_vadc ADC_USB_IN_V_16>,

		      <&pm6150_vadc ADC_USB_IN_I>,

		      <&pm6150_vadc ADC_CHG_TEMP>;

	io-channel-names = "usb_in_voltage",

			   "usb_in_current",

			   "chg_temp";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

};

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

+24 −0
Original line number Diff line number Diff line
@@ -11,10 +11,18 @@ 
 */



#include "sm6150-thermal-overlay.dtsi"

#include <dt-bindings/iio/qcom,spmi-vadc.h>



&soc {

};



/ {

	mtp_batterydata: qcom,battery-data {

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

		#include "qg-batterydata-alium-3600mah.dtsi"

	};

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v3-660";
@@ -42,3 +50,19 @@ 


	status = "ok";

};



&pm6150_qg {

	qcom,battery-data = <&mtp_batterydata>;

};



&pm6150_charger {

	io-channels = <&pm6150_vadc ADC_USB_IN_V_16>,

		      <&pm6150_vadc ADC_USB_IN_I>,

		      <&pm6150_vadc ADC_CHG_TEMP>;

	io-channel-names = "usb_in_voltage",

			   "usb_in_current",

			   "chg_temp";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

};

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

+4 −0
Original line number Diff line number Diff line
@@ -2082,6 +2082,10 @@ 
#include "sm6150-gpu.dtsi"

#include "sm6150-usb.dtsi"



&pm6150_charger {

	dpdm-supply = <&qusb_phy0>;

};



&usb0 {

	extcon = <&pm6150_pdphy>;

	vbus_dwc3-supply = <&smb5_vbus>;