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

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

Merge "ARM: dts: msm: enable H/W thermal mitigation for PMI632 based platform"

parents b0f1deac 15d3c8f9

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

+9 −6
Original line number Diff line number Diff line
@@ -289,20 +289,20 @@ 
		pmi632_gpios: pinctrl@c000 {

			compatible = "qcom,spmi-gpio";

			reg = <0xc000 0x800>;

			interrupts = <0x2 0xc1 0 IRQ_TYPE_NONE>,

			interrupts = <0x2 0xc0 0 IRQ_TYPE_NONE>,

					<0x2 0xc1 0 IRQ_TYPE_NONE>,

					<0x2 0xc2 0 IRQ_TYPE_NONE>,

					<0x2 0xc3 0 IRQ_TYPE_NONE>,

					<0x2 0xc4 0 IRQ_TYPE_NONE>,

					<0x2 0xc5 0 IRQ_TYPE_NONE>,

					<0x2 0xc6 0 IRQ_TYPE_NONE>,

					<0x2 0xc7 0 IRQ_TYPE_NONE>;

			interrupt-names = "pmi632_gpio2", "pmi632_gpio3",

					"pmi632_gpio4", "pmi632_gpio5",

					"pmi632_gpio6", "pmi632_gpio7",

					"pmi632_gpio8";

			interrupt-names = "pmi632_gpio1", "pmi632_gpio2",

					"pmi632_gpio3", "pmi632_gpio4",

					"pmi632_gpio5", "pmi632_gpio6",

					"pmi632_gpio7", "pmi632_gpio8";

			gpio-controller;

			#gpio-cells = <2>;

			qcom,gpios-disallowed = <1>;

		};



		pmi632_charger: qcom,qpnp-smb5 {
@@ -318,6 +318,9 @@ 
			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

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

+15 −2
Original line number Diff line number Diff line
@@ -565,6 +565,15 @@ 
			bias-disable;		/* no-pull */

		};

	};



	pmi632_ctm {

		/* Disable GPIO1 for h/w base mitigation */

		pmi632_ctm_default: pmi632_ctm_default {

			pins = "gpio1";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {
@@ -585,7 +594,7 @@ 
&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -593,13 +602,15 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};



&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {
@@ -607,5 +618,7 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};

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

+15 −2
Original line number Diff line number Diff line
@@ -371,6 +371,15 @@ 
			bias-disable;		/* no-pull */

		};

	};



	pmi632_ctm {

		/* Disable GPIO1 for h/w base mitigation */

		pmi632_ctm_default: pmi632_ctm_default {

			pins = "gpio1";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {
@@ -391,7 +400,7 @@ 
&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -399,13 +408,15 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};



&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <61 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {
@@ -413,5 +424,7 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};

arch/arm64/boot/dts/qcom/sdm450-pmi632-mtp-s3.dtsi

+15 −2
Original line number Diff line number Diff line
@@ -68,6 +68,15 @@ 
			bias-disable;		/* no-pull */

		};

	};



	pmi632_ctm {

		/* Disable GPIO1 for h/w base mitigation */

		pmi632_ctm_default: pmi632_ctm_default {

			pins = "gpio1";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {
@@ -88,7 +97,7 @@ 
&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -96,13 +105,15 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};



&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {
@@ -110,5 +121,7 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};

arch/arm64/boot/dts/qcom/sdm450-qrd-sku4.dtsi

+15 −2
Original line number Diff line number Diff line
@@ -213,12 +213,21 @@ 
			input-enable;

		};

	};



	pmi632_ctm {

		/* Disable GPIO1 for h/w base mitigation */

		pmi632_ctm_default: pmi632_ctm_default {

			pins = "gpio1";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};

};



&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -226,13 +235,15 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};



&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

		&smb_en_default &pmi632_sense_default>;

		&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {
@@ -240,5 +251,7 @@ 
		/delete-property/ io-channels;

		/delete-property/ io-channels-names;

		qcom,parallel-mode = <1>;

		qcom,disable-ctm;

		qcom,hw-die-temp-mitigation;

	};

};