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

Commit 6ce787f2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "NFC: bbclk2 to be pin controlled"

parents 6ff8cf43 39364e49

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
			pinctrl-0 = <&nfc_int_active &nfc_disable_active>;

			pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;

			qcom,clk-gpio = <&pm8916_gpios 2 0>;

			clocks = <&clock_rpm clk_bb_clk2>;

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

		};

	};

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
			pinctrl-0 = <&nfc_int_active &nfc_disable_active>;

			pinctrl-1 = <&nfc_int_suspend &nfc_disable_suspend>;

			qcom,clk-gpio = <&pm8916_gpios 2 0>;

			clocks = <&clock_rpm clk_bb_clk2>;

			clocks = <&clock_rpm clk_bb_clk2_pin>;

			clock-names = "ref_clk";

		};

	};