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

Commit f7b598ad 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 clk entry for NFC on all 8909w targets"

parents 1c8d9a23 342c69e0

arch/arm64/boot/dts/qcom/apq8009w-bg-alpha.dts

+4 −1
Original line number Diff line number Diff line
@@ -158,8 +158,11 @@ 
		interrupts = <50 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfcw_int_active &nfcw_disable_active>;

		pinctrl-0 = <&nfcw_int_active

			     &nfcw_disable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfcw_int_suspend &nfcw_disable_suspend>;

		clocks = <&clock_rpm clk_bb_clk3_pin>;

		clock-names = "ref_clk";

	};

};

arch/arm64/boot/dts/qcom/apq8009w-bg-wtp-v2.dts

+4 −1
Original line number Diff line number Diff line
@@ -177,8 +177,11 @@ 
		interrupts = <50 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfcw_int_active &nfcw_disable_active>;

		pinctrl-0 = <&nfcw_int_active

			     &nfcw_disable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfcw_int_suspend &nfcw_disable_suspend>;

		clocks = <&clock_rpm clk_bb_clk3_pin>;

		clock-names = "ref_clk";

	};

};

arch/arm64/boot/dts/qcom/msm8909w-bg-wtp-v2.dts

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ 
			     &nfcw_disable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfcw_int_suspend &nfcw_disable_suspend>;

		clocks = <&clock_rpm clk_bb_clk3_pin>;

		clock-names = "ref_clk";

	};

};