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

Commit 1480b6a1 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 sdm660"

parents 0a7b7fc1 b28d9466

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

+33 −0
Original line number Diff line number Diff line
@@ -42,6 +42,39 @@ 
	status = "ok";

};



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

	};

};



&i2c_6 { /* BLSP1 QUP6 (NFC) */

	status = "okay";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

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

		qcom,nq-esepwr = <&tlmm 31 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK3";

		interrupts = <28 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmcc RPM_LN_BB_CLK3_PIN>;

		clock-names = "ref_clk";

	};

};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};

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

+33 −0
Original line number Diff line number Diff line
@@ -47,6 +47,39 @@ 
	status = "ok";

};



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

	};

};



&i2c_6 { /* BLSP1 QUP6 (NFC) */

	status = "okay";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

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

		qcom,nq-esepwr = <&tlmm 31 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK3";

		interrupts = <28 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmcc RPM_LN_BB_CLK3_PIN>;

		clock-names = "ref_clk";

	};

};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};

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

+62 −0
Original line number Diff line number Diff line
@@ -369,6 +369,68 @@ 
			};

		};



		nfc {

			nfc_int_active: nfc_int_active {

				/* active state */

				mux {

					/* GPIO 28 NFC Read Interrupt */

					pins = "gpio28";

					function = "gpio";

				};



				config {

					pins = "gpio28";

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

					bias-pull-up;

				};

			};



			nfc_int_suspend: nfc_int_suspend {

				/* sleep state */

				mux {

					/* GPIO 28 NFC Read Interrupt */

					pins = "gpio28";

					function = "gpio";

				};



				config {

					pins = "gpio28";

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

					bias-pull-up;

				};

			};



			nfc_enable_active: nfc_enable_active {

				/* active state */

				mux {

					/* 29: NFC ENABLE 31:ESE Enable */

					pins = "gpio29", "gpio31";

					function = "gpio";

				};



				config {

					pins = "gpio29", "gpio31";

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

					bias-pull-up;

				};

			};



			nfc_enable_suspend: nfc_enable_suspend {

				/* sleep state */

				mux {

					/* 29: NFC ENABLE 31:ESE Enable */

					pins = "gpio29", "gpio31";

					function = "gpio";

				};



				config {

					pins = "gpio29", "gpio31";

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

					bias-disable;

				};

			};

		};



		i2c_7 {

			i2c_7_active: i2c_7_active {

				mux {

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

+31 −0
Original line number Diff line number Diff line
@@ -119,6 +119,37 @@ 
		qcom,src-sel = <0>;

		qcom,out-strength = <1>;

	};



	/* GPIO 4 (NFC_CLK_REQ) */

	gpio@c300 {

		qcom,mode = <0>;

		qcom,vin-sel = <1>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		status = "okay";

	};

};



&i2c_6 { /* BLSP1 QUP6 (NFC) */

	status = "okay";

	nq@28 {

		compatible = "qcom,nq-nci";

		reg = <0x28>;

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

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

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

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

		qcom,nq-esepwr = <&tlmm 31 0x00>;

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK3";

		interrupts = <28 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmcc RPM_LN_BB_CLK3_PIN>;

		clock-names = "ref_clk";

	};

};



&pm660l_gpios {