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

Commit 4ddccd15 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 pnoc voting for the modem on MSM8994"

parents 8da6df0e 35d31951
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -1748,12 +1748,13 @@

		clocks = <&clock_rpm clk_cxo_clk_src>,
			 <&clock_rpm clk_mss_cfg_ahb_clk>,
			 <&clock_rpm clk_pnoc_clk>,
			 <&clock_gcc clk_gcc_mss_q6_bimc_axi_clk>,
			 <&clock_gcc clk_gcc_boot_rom_ahb_clk>,
			 <&clock_gcc clk_gpll0_out_msscc>;
		clock-names = "xo", "iface_clk", "bus_clk", "mem_clk",
			      "gpll0_mss_clk";
		qcom,proxy-clock-names = "xo";
		clock-names = "xo", "iface_clk", "pnoc_clk", "bus_clk",
			      "mem_clk", "gpll0_mss_clk";
		qcom,proxy-clock-names = "xo", "pnoc_clk";
		qcom,active-clock-names = "iface_clk", "bus_clk", "mem_clk",
				     "gpll0_mss_clk";

@@ -1771,6 +1772,7 @@
		qcom,ssctl-instance-id = <0x12>;
		qcom,override-acc;
		qcom,ahb-clk-vote;
		qcom,pnoc-clk-vote;

		/* GPIO inputs from mss */
		qcom,gpio-err-fatal = <&smp2pgpio_ssr_smp2p_1_in 0 0>;