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

Commit 39b7c5b6 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: smmu and modem switch to virtual clock on msm8996 vplatform"

parents 04b6b652 ade10b60
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -105,13 +105,13 @@
			"halt_nc", "rmb_base", "restart_reg";

		clocks = <&clock_gcc clk_cxo_clk_src>,
			<&clock_gcc clk_gcc_mss_cfg_ahb_clk>,
			<&clock_virt clk_gcc_mss_cfg_ahb_clk>,
			<&clock_gcc 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_gcc clk_gcc_mss_snoc_axi_clk>,
			<&clock_gcc clk_gcc_mss_mnoc_bimc_axi_clk>,
			<&clock_virt clk_gcc_mss_q6_bimc_axi_clk>,
			<&clock_virt clk_gcc_boot_rom_ahb_clk>,
			<&clock_virt clk_gpll0_out_msscc>,
			<&clock_virt clk_gcc_mss_snoc_axi_clk>,
			<&clock_virt clk_gcc_mss_mnoc_bimc_axi_clk>,
			<&clock_gcc clk_qdss_clk>;
		clock-names = "xo", "iface_clk", "pnoc_clk", "bus_clk",
				"mem_clk", "gpll0_mss_clk", "snoc_axi_clk",
+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@
		<GIC_SPI 402 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 403 IRQ_TYPE_LEVEL_HIGH>;
	vdd-supply = <&gdsc_hlos1_vote_lpass_adsp>;
	clocks = <&clock_gcc clk_hlos1_vote_lpass_adsp_smmu_clk>;
	clocks = <&clock_virt clk_hlos1_vote_lpass_adsp_smmu_clk>;
	clock-names = "lpass_q6_smmu_clocks";
	#clock-cells = <1>;
};