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

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

Merge "ARM: dts: msm: Add NFC device node for lagoon"

parents 938b31ef 036ca386

qcom/lagoon-atp.dtsi

+22 −0
Original line number Original line Diff line number Diff line
@@ -177,6 +177,28 @@ 
	qcom,dsi-default-panel = <&dsi_rm69299_visionox_amoled_video>;

	qcom,dsi-default-panel = <&dsi_rm69299_visionox_amoled_video>;

};

};





&qupv3_se0_i2c {

	status = "ok";

	#address-cells = <1>;

	#size-cells = <0>;

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

		qcom,nq-clkreq = <&tlmm 7 0x00>;

		interrupt-parent = <&tlmm>;

		interrupts = <9 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active

				&nfc_clk_req_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend

				&nfc_clk_req_suspend>;

	};

};



&qupv3_se8_i2c {

&qupv3_se8_i2c {

	status = "okay";

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";

	qcom,i2c-touch-active="synaptics,tcm-i2c";

qcom/lagoon-cdp.dtsi

+22 −0
Original line number Original line Diff line number Diff line
@@ -260,6 +260,28 @@ 
	qcom,dsi-default-panel = <&dsi_rm69299_visionox_amoled_video>;

	qcom,dsi-default-panel = <&dsi_rm69299_visionox_amoled_video>;

};

};





&qupv3_se0_i2c {

	status = "ok";

	#address-cells = <1>;

	#size-cells = <0>;

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

		qcom,nq-clkreq = <&tlmm 7 0x00>;

		interrupt-parent = <&tlmm>;

		interrupts = <9 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active

				&nfc_clk_req_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend

				&nfc_clk_req_suspend>;

	};

};



&qupv3_se8_i2c {

&qupv3_se8_i2c {

	status = "okay";

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";

	qcom,i2c-touch-active="synaptics,tcm-i2c";

qcom/lagoon-mtp.dtsi

+22 −0
Original line number Original line Diff line number Diff line
@@ -186,6 +186,28 @@ 
	qcom,dsi-default-panel = <&dsi_rm69299_visionox_amoled_video>;

	qcom,dsi-default-panel = <&dsi_rm69299_visionox_amoled_video>;

};

};





&qupv3_se0_i2c {

	status = "ok";

	#address-cells = <1>;

	#size-cells = <0>;

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

		qcom,nq-clkreq = <&tlmm 7 0x00>;

		interrupt-parent = <&tlmm>;

		interrupts = <9 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active

				&nfc_clk_req_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend

				&nfc_clk_req_suspend>;

	};

};



&qupv3_se8_i2c {

&qupv3_se8_i2c {

	status = "okay";

	status = "okay";

	qcom,i2c-touch-active="synaptics,tcm-i2c";

	qcom,i2c-touch-active="synaptics,tcm-i2c";

qcom/lagoon-pinctrl.dtsi

+92 −0
Original line number Original line Diff line number Diff line
@@ -295,6 +295,98 @@ 
			};

			};

		};

		};





		nfc {

			nfc_int_active: nfc_int_active {

				/* active state */

				mux {

					/* GPIO 9 NFC Read Interrupt */

					pins = "gpio9";

					function = "gpio";

				};



				config {

					pins = "gpio9";

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

					bias-pull-up;

				};

			};



			nfc_int_suspend: nfc_int_suspend {

				/* sleep state */

				mux {

					/* GPIO 9 NFC Read Interrupt */

					pins = "gpio9";

					function = "gpio";

				};



				config {

					pins = "gpio9";

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

					bias-pull-up;

				};

			};



			nfc_enable_active: nfc_enable_active {

				/* active state */

				mux {

					/* 6: Enable 8: Firmware */

					pins = "gpio6", "gpio8";

					function = "gpio";

				};



				config {

					pins = "gpio6", "gpio8";

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

					bias-pull-up;

				};

			};



			nfc_enable_suspend: nfc_enable_suspend {

				/* sleep state */

				mux {

					/* 6: Enable 8: Firmware */

					pins = "gpio6", "gpio8";

					function = "gpio";

				};



				config {

					pins = "gpio6", "gpio8";

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

					bias-disable;

				};

			};



			nfc_clk_req_active: nfc_clk_req_active {

				/* active state */

				mux {

					/* GPIO 7: NFC CLOCK REQUEST */

					pins = "gpio7";

					function = "gpio";

				};



				config {

					pins = "gpio7";

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

					bias-pull-up;

				};

			};



			nfc_clk_req_suspend: nfc_clk_req_suspend {

				/* sleep state */

				mux {

					/* GPIO 7: NFC CLOCK REQUEST */

					pins = "gpio7";

					function = "gpio";

				};



				config {

					pins = "gpio7";

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

					bias-disable;

				};

			};

		};



		qupv3_se2_i2c_pins: qupv3_se2_i2c_pins {

		qupv3_se2_i2c_pins: qupv3_se2_i2c_pins {

			qupv3_se2_i2c_active: qupv3_se2_i2c_active {

			qupv3_se2_i2c_active: qupv3_se2_i2c_active {

				mux {

				mux {

qcom/lagoon-qrd.dtsi

+22 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,28 @@ 
	qcom,dsi-default-panel = <&dsi_r66451_amoled_120hz_video>;

	qcom,dsi-default-panel = <&dsi_r66451_amoled_120hz_video>;

};

};





&qupv3_se0_i2c {

	status = "ok";

	#address-cells = <1>;

	#size-cells = <0>;

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

		qcom,nq-clkreq = <&tlmm 7 0x00>;

		interrupt-parent = <&tlmm>;

		interrupts = <9 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active

				&nfc_clk_req_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend

				&nfc_clk_req_suspend>;

	};

};



&pm7250b_charger {

&pm7250b_charger {

	status = "ok";

	status = "ok";

	io-channels = <&pm7250b_vadc ADC_USB_IN_V_16>,

	io-channels = <&pm7250b_vadc ADC_USB_IN_V_16>,