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

Commit fde7d8f0 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 to MSM8937 CDP"

parents 99117aee aa4079a7

arch/arm/boot/dts/qcom/msm8937-cdp.dtsi

+33 −0
Original line number Original line Diff line number Diff line
@@ -195,6 +195,19 @@ 




};

};





&pm8937_gpios {

	gpio@c400 {

		qcom,mode = <0>;

		qcom,output-type = <0>;

		qcom,pull = <0>;

		qcom,vin-sel = <2>;

		qcom,out-strength = <3>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		status = "okay";

	};

};



&spi_3 { /* BLSP1 QUP3 */

&spi_3 { /* BLSP1 QUP3 */

	maxim_sti@0 {

	maxim_sti@0 {

		status = "disabled";

		status = "disabled";
@@ -218,6 +231,26 @@ 
	};

	};

};

};





&i2c_5 { /* BLSP2 QUP1 */

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

		qcom,nq-clkreq = <&pm8937_gpios 5 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK2";

		interrupts = <17 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";

	};

};



#include "msm8937-mdss-panels.dtsi"

#include "msm8937-mdss-panels.dtsi"





&mdss_mdp {

&mdss_mdp {