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

Commit f7d4246f 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 8909w BG2"

parents 59cc2b45 634a8967

arch/arm/boot/dts/qcom/apq8009w-bg-wtp-v2.dts

+18 −1
Original line number Diff line number Diff line
@@ -139,7 +139,24 @@ 
};



&i2c_1 {

	status = "disabled";

	status = "okay";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

		qcom,nq-irq = <&msm_gpio 50 0x00>;

		qcom,nq-ven = <&msm_gpio 36 0x00>;

		qcom,nq-firm = <&msm_gpio 38 0x00>;

		qcom,nq-esepwr = <&msm_gpio 49 0x00>;

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

		qcom,clk-src = "BBCLK3";

		interrupt-parent = <&msm_gpio>;

		interrupts = <50 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfcw_int_active &nfcw_disable_active>;

		pinctrl-1 = <&nfcw_int_suspend &nfcw_disable_suspend>;

		clock-names = "ref_clk";

	};

};



&spi_0 {

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

+48 −0
Original line number Diff line number Diff line
@@ -514,6 +514,54 @@ 
		};



		nfc {

			nfcw_int_active: nfcw_int_active {

				mux {

					pins = "gpio50";

					function = "gpio";

				};

				config {

					pins = "gpio50";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfcw_int_suspend: nfcw_int_suspend {

				mux {

					pins = "gpio50";

					function = "gpio";

				};

				config {

					pins = "gpio50";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfcw_disable_active: nfcw_disable_active {

				mux {

					pins = "gpio36";

					function = "gpio";

				};

				config {

					pins = "gpio36";

					drive-strength = <6>;

					bias-pull-up;

				};

			};



			nfcw_disable_suspend: nfcw_disable_suspend {

				mux {

					pins = "gpio36";

					function = "gpio";

				};

				config {

					pins = "gpio36";

					drive-strength = <6>;

					bias-disable;

				};

			};



			nfc_int_active: nfc_int_active {

				mux {

					pins = "gpio21";

arch/arm/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

+18 −1
Original line number Diff line number Diff line
@@ -169,7 +169,24 @@ 
};



&i2c_1 {

	status = "disabled";

	status = "okay";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

		qcom,nq-irq = <&msm_gpio 50 0x00>;

		qcom,nq-ven = <&msm_gpio 36 0x00>;

		qcom,nq-firm = <&msm_gpio 38 0x00>;

		qcom,nq-esepwr = <&msm_gpio 49 0x00>;

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

		qcom,clk-src = "BBCLK3";

		interrupt-parent = <&msm_gpio>;

		interrupts = <50 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfcw_int_active &nfcw_disable_active>;

		pinctrl-1 = <&nfcw_int_suspend &nfcw_disable_suspend>;

		clock-names = "ref_clk";

	};

};



&spi_0 {

arch/arm/boot/dts/qcom/msm8909w-pm660-mtp.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -216,6 +216,15 @@ 
};



&pm660_gpios {

	/* GPIO 4 (NFC_CLK_REQ) */

	gpio@c300 {

		qcom,mode = <0>;

		qcom,vin-sel = <1>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		status = "okay";

	};



	gpio@cb00 {

		status = "ok";

		qcom,mode = <1>;