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

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

Merge "ARM: dts: msm: Add pmic support for sdm439 and sdm429"

parents aae7166e 7c136189

qcom/pm8953.dtsi

+3 −15
Original line number Diff line number Diff line
@@ -283,22 +283,9 @@ 
		};



		pm8953_rtc: qcom,pm8953_rtc {

			spmi-dev-container;

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

			#size-cells = <1>;

			qcom,qpnp-rtc-write = <0>;

			qcom,qpnp-rtc-alarm-pwrup = <0>;



			qcom,pm8953_rtc_rw@6000 {

				reg = <0x6000 0x100>;

			};



			qcom,pm8953_rtc_alarm@6100 {

				reg = <0x6100 0x100>;

			compatible = "qcom,pm8916-rtc";

			interrupts = <0x0 0x61 0x1 IRQ_TYPE_NONE>;

		};

		};



		pm8953_typec: qcom,pm8953_typec@bf00 {

			compatible = "qcom,qpnp-typec";
@@ -333,6 +320,7 @@ 
			reg = <0xbc00 0x100>;

			reg-names = "lpg-base";

			#pwm-cells = <2>;

			qcom,num-lpg-channels = <1>;

		};

	};

};

qcom/sdm439-mtp.dtsi

+17 −3
Original line number Diff line number Diff line
@@ -617,10 +617,24 @@ 
		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	status = "ok";

	smb1355_charger: qcom,smb1355-charger@1000 {

		status = "ok";

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};



&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	status = "ok";

	smb1355_charger_0: qcom,smb1355-charger@1000 {

		status = "ok";

		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

qcom/sdm439-pmi632.dtsi

+14 −4
Original line number Diff line number Diff line
@@ -2,6 +2,17 @@ 


&pmi632_charger {

	dpdm-supply = <&usb_otg>;

	qcom,battery-data = <&mtp_batterydata>;

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

	qcom,flash-disable-soc = <10>;

	qcom,sw-jeita-enable;

	qcom,step-charging-enable;

	qcom,hw-die-temp-mitigation;

	qcom,hw-connector-mitigation;

	qcom,connector-internal-pull-kohm = <100>;

	qcom,thermal-mitigation

	    = <3000000 2500000 2000000 1500000

		1000000 500000>;

};



&usb_otg {
@@ -24,10 +35,9 @@ 


&pmi632_qg {

	qcom,battery-data = <&mtp_batterydata>;

};



&pmi632_charger {

	qcom,battery-data = <&mtp_batterydata>;

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

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

};



&pmi632_vadc {

qcom/sdm439-qrd.dtsi

+17 −3
Original line number Diff line number Diff line
@@ -402,10 +402,24 @@ 
		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	status = "ok";

	smb1355_charger: qcom,smb1355-charger@1000 {

		status = "ok";

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};



&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	status = "ok";

	smb1355_charger_0: qcom,smb1355-charger@1000 {

		status = "ok";

		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

qcom/smb1355.dtsi

+43 −0
Original line number Diff line number Diff line
@@ -42,3 +42,46 @@ smb1355: qcom,smb1355@c { 
		};

	};

};



smb1355_0: qcom,smb1355@8 {

	compatible = "qcom,i2c-pmic";

	reg = <0x8>;

	#address-cells = <1>;

	#size-cells = <0>;

	interrupt-parent = <&spmi_bus>;

	interrupts = <0x0 0xd1 0x0 IRQ_TYPE_LEVEL_LOW>;

	interrupt_names = "smb1355_0";

	interrupt-controller;

	#interrupt-cells = <3>;

	qcom,periph-map = <0x10 0x12 0x13 0x16>;

	status = "disabled";



	smb1355_revid_0: qcom,revid@100 {

		compatible = "qcom,qpnp-revid";

		reg = <0x100 0x100>;

	};



	smb1355_charger_0: qcom,smb1355-charger@1000 {

		compatible = "qcom,smb1355";

		qcom,pmic-revid = <&smb1355_revid_0>;

		reg = <0x1000 0x700>;

		#address-cells = <1>;

		#size-cells = <1>;

		interrupt-parent = <&smb1355_0>;

		status = "disabled";



		qcom,chgr@1000 {

			reg = <0x1000 0x100>;

			interrupts = <0x10 0x1 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "chg-state-change";

		};



		qcom,chgr-misc@1600 {

			reg = <0x1600 0x100>;

			interrupts = <0x16 0x1 IRQ_TYPE_EDGE_RISING>,

				     <0x16 0x6 IRQ_TYPE_EDGE_RISING>;

			interrupt-names = "wdog-bark",

					  "temperature-change";

		};

	};

};