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

Commit 00142c3b 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: Adding eSE power gpio entry for MSM8953"

parents 9f19fc6c f65da366

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
		qcom,nq-ven = <&tlmm 16 0x00>;

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

		qcom,nq-clkreq = <&pm8953_gpios 2 0x00>;

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

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK2";

		interrupts = <17 0>;

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
		qcom,nq-ven = <&tlmm 16 0x00>;

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

		qcom,nq-clkreq = <&pm8953_gpios 2 0x00>;

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

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK2";

		interrupts = <17 0>;

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

+54 −26
Original line number Diff line number Diff line
@@ -746,41 +746,69 @@ 
			};

		};



		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 62: FW DNLD */

					/* 141: ESE Enable */

					pins = "gpio16", "gpio62", "gpio141";

					function = "gpio";

				};



			nfc_disable_active: active {

				drive-strength = <6>;

				config {

					pins = "gpio16", "gpio62", "gpio141";

					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 62: FW DNLD */

					/* 141: ESE Enable */

					pins = "gpio16", "gpio62", "gpio141";

					function = "gpio";

				};



				config {

					pins = "gpio16", "gpio62", "gpio141";

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

					bias-disable;

				};

			};

		};



		wcnss_pmux_5wire {

			/* Active configuration of bus pins */

arch/arm64/boot/dts/qcom/msm8953-qrd.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
		qcom,nq-ven = <&tlmm 16 0x00>;

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

		qcom,nq-clkreq = <&pm8953_gpios 2 0x00>;

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

		interrupt-parent = <&tlmm>;

		qcom,clk-src = "BBCLK2";

		interrupts = <17 0>;