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

Commit c385ee33 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 nq device to 8996 mtp"

parents ee2564ce 56746f39

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+39 −0
Original line number Diff line number Diff line
@@ -700,6 +700,17 @@ 
};



&pm8994_gpios {

	gpio@c600 { /* GPIO 7 - NFC DWL REQ */

		qcom,mode = <1>;

		qcom,output-type = <0>;

		qcom,pull = <5>;

		qcom,vin-sel = <2>;

		qcom,out-strength = <3>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		status = "okay";

	};



	gpio@c700 { /* GPIO 8 - WLAN_EN */

		qcom,mode = <1>;		/* Digital output*/

		qcom,pull = <4>;		/* Pulldown 10uA */
@@ -721,6 +732,14 @@ 
		status = "okay";

	};



	gpio@c900 { /* GPIO 10 - NFC CLK _REQ*/

		qcom,mode = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		status = "okay";

	};



	gpio@cd00 { /* GPIO 14 - lcd_bklt_reg_en */

		qcom,mode = <1>;	/* DIGITAL OUT */

		qcom,output-type = <0>;		/* CMOS logic */
@@ -838,6 +857,26 @@ 
	};

};



&i2c_8 { /* BLSP2 QUP2 */

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

		qcom,nq-firm = <&pm8994_gpios 7 0x00>;

		qcom,nq-clkreq = <&pm8994_gpios 10 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK2";

		interrupts = <9 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_disable_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;

		clocks = <&clock_gcc clk_bb_clk2_pin>;

		clock-names = "ref_clk";

	};

};



&slim_msm {

	tomtom_codec {

		qcom,cdc-micbias2-headset-only;

arch/arm/boot/dts/qcom/msm8996-pinctrl.dtsi

+56 −0
Original line number Diff line number Diff line
@@ -576,6 +576,62 @@ 
			};

		};



		pmx_rd_nfc_int {

			nfc_int_active: active {

				mux {

					pins = "gpio9";

					function = "gpio";

				};



				config {

					pins = "gpio9";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfc_int_suspend: suspend {

				mux {

					pins = "gpio9";

					function = "gpio";

				};



				config {

					pins = "gpio9";

					drive-strength = <6>;

					bias-pull-up;

				};

			};

		};



		pmx_nfc_reset {

			nfc_disable_active: active {

				mux {

					pins = "gpio12";

					function = "gpio";

				};



				config {

					pins = "gpio12";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfc_disable_suspend: suspend {

				mux {

					pins = "gpio12";

					function = "gpio";

				};



				config {

					pins = "gpio12";

					drive-strength = <6>;

					bias-disable;

				};

			};

		};



		spi_0 {

			spi_0_active: spi_0_active {

				mux {