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

Commit 1d54c6c8 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 NFC device node for SDM670"

parents 8e96f4f7 0a1cd652

arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi

+21 −1
Original line number Diff line number Diff line
@@ -53,7 +53,27 @@ 
};



&qupv3_se3_i2c {

	status = "disabled";

	status = "ok";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

		qcom,nq-irq = <&tlmm 44 0x00>;

		qcom,nq-ven = <&tlmm 12 0x00>;

		qcom,nq-firm = <&tlmm 43 0x00>;

		qcom,nq-clkreq = <&pm660_gpios 4 0x00>;

		qcom,nq-esepwr = <&tlmm 116 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK3";

		interrupts = <44 0>;

		interrupt-names = "nfc_irq";

		pinctrl-names = "nfc_active", "nfc_suspend";

		pinctrl-0 = <&nfc_int_active

			     &nfc_enable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmh RPMH_LN_BB_CLK3>;

		clock-names = "ref_clk";

	};

};



&qupv3_se10_i2c {

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

+21 −1
Original line number Diff line number Diff line
@@ -54,7 +54,27 @@ 
};



&qupv3_se3_i2c {

	status = "disabled";

	status = "ok";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

		qcom,nq-irq = <&tlmm 44 0x00>;

		qcom,nq-ven = <&tlmm 12 0x00>;

		qcom,nq-firm = <&tlmm 43 0x00>;

		qcom,nq-clkreq = <&pm660_gpios 4 0x00>;

		qcom,nq-esepwr = <&tlmm 116 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK3";

		interrupts = <44 0>;

		interrupt-names = "nfc_irq";

		pinctrl-names = "nfc_active", "nfc_suspend";

		pinctrl-0 = <&nfc_int_active

			     &nfc_enable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmh RPMH_LN_BB_CLK3>;

		clock-names = "ref_clk";

	};

};



&qupv3_se10_i2c {

arch/arm64/boot/dts/qcom/sdm670-pinctrl.dtsi

+72 −0
Original line number Diff line number Diff line
@@ -1371,6 +1371,70 @@ 
			};

		};



		nfc {

			nfc_int_active: nfc_int_active {

				/* active state */

				mux {

					/* GPIO 44 NFC Read Interrupt */

					pins = "gpio44";

					function = "gpio";

				};



				config {

					pins = "gpio44";

					drive-strength = <2>; /* 2 MA */

					bias-pull-up;

				};

			};



			nfc_int_suspend: nfc_int_suspend {

				/* sleep state */

				mux {

					/* GPIO 44 NFC Read Interrupt */

					pins = "gpio44";

					function = "gpio";

				};



				config {

					pins = "gpio44";

					drive-strength = <2>; /* 2 MA */

					bias-pull-up;

				};

			};



			nfc_enable_active: nfc_enable_active {

				/* active state */

				mux {

					/* 12: NFC ENABLE 43: FW DNLD */

					/* 116: ESE Enable */

					pins = "gpio12", "gpio43", "gpio116";

					function = "gpio";

				};



				config {

					pins = "gpio12", "gpio43", "gpio116";

					drive-strength = <2>; /* 2 MA */

					bias-pull-up;

				};

			};



			nfc_enable_suspend: nfc_enable_suspend {

				/* sleep state */

				mux {

					/* 12: NFC ENABLE 43: FW DNLD */

					/* 116: ESE Enable */

					pins = "gpio12", "gpio43", "gpio116";

					function = "gpio";

				};



				config {

					pins = "gpio12", "gpio43", "gpio116";

					drive-strength = <2>; /* 2 MA */

					bias-disable;

				};

			};

		};



		/* WSA speaker reset pins */

		spkr_1_sd_n {

			spkr_1_sd_n_sleep: spkr_1_sd_n_sleep {
@@ -1651,6 +1715,14 @@ 
};



&pm660_gpios {

	nfc_clk {

		nfc_clk_default: nfc_clk_default {

			pins = "gpio4";

			function = "normal";

			input-enable;

			power-source = <1>;

		};

	};

	smb_shutdown_default: smb_shutdown_default {

		pins = "gpio11";

		function = "normal";

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

+21 −1
Original line number Diff line number Diff line
@@ -28,7 +28,27 @@ 
};



&qupv3_se3_i2c {

	status = "disabled";

	status = "ok";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

		qcom,nq-irq = <&tlmm 44 0x00>;

		qcom,nq-ven = <&tlmm 12 0x00>;

		qcom,nq-firm = <&tlmm 43 0x00>;

		qcom,nq-clkreq = <&pm660_gpios 4 0x00>;

		qcom,nq-esepwr = <&tlmm 116 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK3";

		interrupts = <44 0>;

		interrupt-names = "nfc_irq";

		pinctrl-names = "nfc_active", "nfc_suspend";

		pinctrl-0 = <&nfc_int_active

			     &nfc_enable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmh RPMH_LN_BB_CLK3>;

		clock-names = "ref_clk";

	};

};



&qupv3_se10_i2c {