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

Commit 18be522e 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: Add PMI632 GPIO configuration for parallel-current sense"

parents 31a35235 ca13a0ce

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

+11 −2
Original line number Diff line number Diff line
@@ -241,6 +241,15 @@ 
			output-enable;

		};

	};



	pmi632_sense {

		/* GPIO 7 and 8 are external-sense pins for PMI632 */

		pmi632_sense_default: pmi632_sense_default {

			pins = "gpio7", "gpio8";

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

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {
@@ -261,7 +270,7 @@ 
&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -275,7 +284,7 @@ 
&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {

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

+11 −2
Original line number Diff line number Diff line
@@ -338,6 +338,15 @@ 
			output-enable;

		};

	};



	pmi632_sense {

		/* GPIO 7 and 8 are external-sense pins for PMI632 */

		pmi632_sense_default: pmi632_sense_default {

			pins = "gpio7", "gpio8";

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

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {
@@ -358,7 +367,7 @@ 
&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -372,7 +381,7 @@ 
&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {

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

+11 −2
Original line number Diff line number Diff line
@@ -59,6 +59,15 @@ 
			output-enable;

		};

	};



	pmi632_sense {

		/* GPIO 7 and 8 are external-sense pins for PMI632 */

		pmi632_sense_default: pmi632_sense_default {

			pins = "gpio7", "gpio8";

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

			bias-disable;		/* no-pull */

		};

	};

};



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

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -93,7 +102,7 @@ 
&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {

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

+11 −2
Original line number Diff line number Diff line
@@ -189,6 +189,15 @@ 
			output-enable;

		};

	};



	pmi632_sense {

		/* GPIO 7 and 8 are external-sense pins for PMI632 */

		pmi632_sense_default: pmi632_sense_default {

			pins = "gpio7", "gpio8";

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

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {
@@ -209,7 +218,7 @@ 
&smb1355_0 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_0: qcom,smb1355-charger@1000 {
@@ -223,7 +232,7 @@ 
&smb1355_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default

			&smb_en_default>;

		&smb_en_default &pmi632_sense_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <59 IRQ_TYPE_LEVEL_LOW>;

	smb1355_charger_1: qcom,smb1355-charger@1000 {