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

Commit c62f17c9 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 MSM8917"

parents 1b5d2476 255fa4f1

arch/arm64/boot/dts/qcom/msm8917-cdp-ml-touch-overlay.dts

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
/dts-v1/;

/plugin/;



#include <dt-bindings/clock/msm-clocks-8952.h>

#include "msm8917-cdp.dtsi"

#include "msm8917-cdp-mirror-lake-touch.dtsi"

#include "msm8917-audio-cdp.dtsi"

arch/arm64/boot/dts/qcom/msm8917-cdp.dtsi

+35 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/clock/msm-clocks-8952.h>



&soc {

	gpio_keys {

		compatible = "gpio-keys";
@@ -156,6 +158,39 @@ 
	};

};



&pm8937_gpios {

	nfc_clk {

		nfc_clk_default: nfc_clk_default {

			pins = "gpio5";

			function = "normal";

			input-enable;

			power-source = <1>;

		};

	};

};



&i2c_5 { /* BLSP2 QUP1 (NFC) */

	status = "ok";

	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

						&nfc_clk_default>;

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

arch/arm64/boot/dts/qcom/msm8917-mtp-overlay.dts

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
/plugin/;



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/msm-clocks-8952.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "msm8917-mtp.dtsi"

arch/arm64/boot/dts/qcom/msm8917-mtp.dtsi

+34 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * GNU General Public License for more details.

 */



#include <dt-bindings/clock/msm-clocks-8952.h>

#include "msm8917-camera-sensor-mtp.dtsi"



&blsp1_uart2 {
@@ -19,6 +20,39 @@ 
	pinctrl-0 = <&uart_console_active>;

};



&pm8937_gpios {

	nfc_clk {

		nfc_clk_default: nfc_clk_default {

			pins = "gpio5";

			function = "normal";

			input-enable;

			power-source = <1>;

		};

	};

};



&i2c_5 { /* BLSP2 QUP1 (NFC) */

	status = "ok";

	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

						&nfc_clk_default>;

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

arch/arm64/boot/dts/qcom/msm8917-pinctrl.dtsi

+52 −26
Original line number Diff line number Diff line
@@ -1345,41 +1345,67 @@ 
			};

		};



		pmx_rd_nfc_int {

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

		nfc {

			nfc_int_active: nfc_int_active {

				/* active state */

				mux {

					/* GPIO 17 NFC Read Interrupt */

					pins = "gpio17";

			qcom,pin-func = <0>;

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

			label = "pmx_nfc_int";

					function = "gpio";

				};



			nfc_int_active: active {

				drive-strength = <6>;

				config {

					pins = "gpio17";

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

					bias-pull-up;

				};

			};



			nfc_int_suspend: suspend {

				drive-strength = <6>;

			nfc_int_suspend: nfc_int_suspend {

				/* sleep state */

				mux {

					/* GPIO 17 NFC Read Interrupt */

					pins = "gpio17";

					function = "gpio";

				};



				config {

					pins = "gpio17";

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

					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: nfc_disable_active {

				/* active state */

				mux {

					/* 16: NFC ENABLE 130: FW DNLD */

					pins = "gpio16", "gpio130";

					function = "gpio";

				};



			nfc_disable_active: active {

				drive-strength = <6>;

				config {

					pins = "gpio16", "gpio130";

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

					bias-pull-up;

				};

			};



			nfc_disable_suspend: suspend {

				drive-strength = <6>;

			nfc_disable_suspend: nfc_disable_suspend {

				/* sleep state */

				mux {

					/* 16: NFC ENABLE 130: FW DNLD */

					pins = "gpio16", "gpio130";

					function = "gpio";

				};



				config {

					pins = "gpio16", "gpio130";

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

					bias-disable;

				};

			};

		};



		tlmm_gpio_key {

			gpio_key_active: gpio_key_active {