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

Commit df1f12ea 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"

parents 5b1a21a6 c077f9db

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

+33 −0
Original line number Diff line number Diff line
@@ -103,6 +103,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";

	};

};



&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&pm8937_l8>;
@@ -161,6 +181,19 @@ 
	status = "ok";

};



&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";

	};

};



#include "msm8937-mdss-panels.dtsi"



&mdss_mdp {

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

+36 −0
Original line number Diff line number Diff line
@@ -140,6 +140,42 @@ 
			};

		};



		pmx_rd_nfc_int {

			/*qcom,pins = <&gp 17>;*/

			pins = "gpio17";

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_nfc_int";



			nfc_int_active: active {

				drive-strength = <6>;

				bias-pull-up;

			};



			nfc_int_suspend: suspend {

				drive-strength = <6>;

				bias-pull-up;

			};

		};



		pmx_nfc_reset {

			/*qcom,pins = <&gp 16>;*/

			pins = "gpio16";

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <1>;

			label = "pmx_nfc_disable";



			nfc_disable_active: active {

				drive-strength = <6>;

				bias-pull-up;

			};



			nfc_disable_suspend: suspend {

				drive-strength = <6>;

				bias-disable;

			};

		};



		tlmm_pmi_flash_led {

			rear_flash_led_enable: rear_flash_led_enable {

				mux {

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

+33 −0
Original line number Diff line number Diff line
@@ -110,3 +110,36 @@ 


	status = "ok";

};



&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";

	};

};



&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";

	};

};