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

Commit 6b97a0f4 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: Fix NFC PMIC gpio configuration"

parents f07442cf 243b94b6

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

+3 −1
Original line number Diff line number Diff line
@@ -334,7 +334,9 @@ 
		interrupts = <63 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;

		pinctrl-0 = <&nfc_int_active

			     &nfc_enable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmh RPMH_LN_BB_CLK3>;

		clock-names = "ref_clk";

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

+3 −1
Original line number Diff line number Diff line
@@ -308,7 +308,9 @@ 
		interrupts = <63 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;

		pinctrl-0 = <&nfc_int_active

			     &nfc_enable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmh RPMH_LN_BB_CLK3>;

		clock-names = "ref_clk";

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

+9 −8
Original line number Diff line number Diff line
@@ -2800,14 +2800,6 @@ 
};



&pm8998_gpios {

	gpio@d400 {

		qcom,mode = <0>;

		qcom,vin-sel = <1>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

		status = "okay";

	};



	key_home {

		key_home_default: key_home_default {

			pins = "gpio5";
@@ -2865,6 +2857,15 @@ 
			output-low;

		};

	};



	nfc_clk {

		nfc_clk_default: nfc_clk_default {

			pins = "gpio21";

			function = "normal";

			input-enable;

			power-source = <1>;

		};

	};

};



&pmi8998_gpios {

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

+3 −1
Original line number Diff line number Diff line
@@ -73,7 +73,9 @@ 
		interrupts = <63 0>;

		interrupt-names = "nfc_irq";

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

		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;

		pinctrl-0 = <&nfc_int_active

			     &nfc_enable_active

			     &nfc_clk_default>;

		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;

		clocks = <&clock_rpmh RPMH_LN_BB_CLK3>;

		clock-names = "ref_clk";