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

Commit 0b87df6b authored by Mitchel Humpherys's avatar Mitchel Humpherys
Browse files

ARM: dts: qcom: SMMU: Remove mmssnoc_axi clock on 8996 



The mmssnoc_axi clock is managed by the bus driver so setting a rate on
it can cause conflicts.  Since we have a bus vote in arm-smmu now, just
remove the unnecessary (and dangerous) vote for mmssnoc_axi.

Change-Id: I07f868ab6679aae2af27adc06b7c887538c6a2af
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent d96b4bb7

arch/arm/boot/dts/qcom/msm-arm-smmu-8996.dtsi

+6 −12
Original line number Diff line number Diff line
@@ -86,11 +86,10 @@ 
		<&clock_mmss clk_mmss_mmagic_cfg_ahb_clk>,

		<&clock_mmss clk_smmu_jpeg_ahb_clk>,

		<&clock_mmss clk_smmu_jpeg_axi_clk>,

		<&clock_gcc clk_mmssnoc_axi_clk>,

		<&clock_mmss clk_mmagic_camss_axi_clk>;

	clock-names = "mmagic_ahb_clk", "mmagic_cfg_ahb_clk",

		"jpeg_ahb_clk", "jpeg_axi_clk",

		"mmssnoc_axi_clk", "mmagic_camss_axi_clk";

		"mmagic_camss_axi_clk";

	#clock-cells = <1>;

	qcom,bus-master-id = <MSM_BUS_MASTER_JPEG>;

};
@@ -108,11 +107,10 @@ 
		<&clock_mmss clk_mmss_mmagic_cfg_ahb_clk>,

		<&clock_mmss clk_smmu_vfe_ahb_clk>,

		<&clock_mmss clk_smmu_vfe_axi_clk>,

		<&clock_gcc clk_mmssnoc_axi_clk>,

		<&clock_mmss clk_mmagic_camss_axi_clk>;

	clock-names = "mmagic_ahb_clk", "mmagic_cfg_ahb_clk",

		"vfe_ahb_clk", "vfe_axi_clk",

		"mmssnoc_axi_clk", "mmagic_camss_axi_clk";

		"mmagic_camss_axi_clk";

	#clock-cells = <1>;

	qcom,bus-master-id = <MSM_BUS_MASTER_VFE>;

};
@@ -130,11 +128,10 @@ 
		<&clock_mmss clk_mmss_mmagic_cfg_ahb_clk>,

		<&clock_mmss clk_smmu_cpp_ahb_clk>,

		<&clock_mmss clk_smmu_cpp_axi_clk>,

		<&clock_gcc clk_mmssnoc_axi_clk>,

		<&clock_mmss clk_mmagic_camss_axi_clk>;

	clock-names = "mmagic_ahb_clk", "mmagic_cfg_ahb_clk",

		"cpp_ahb_clk", "cpp_axi_clk",

		"mmssnoc_axi_clk", "mmagic_camss_axi_clk";

		"mmagic_camss_axi_clk";

	#clock-cells = <1>;

	qcom,bus-master-id = <MSM_BUS_MASTER_CPP>;

};
@@ -152,11 +149,10 @@ 
		<&clock_mmss clk_mmss_mmagic_cfg_ahb_clk>,

		<&clock_mmss clk_smmu_video_ahb_clk>,

		<&clock_mmss clk_smmu_video_axi_clk>,

		<&clock_gcc clk_mmssnoc_axi_clk>,

		<&clock_mmss clk_mmagic_video_axi_clk>;

	clock-names = "mmagic_ahb_clk", "mmagic_cfg_ahb_clk",

		"video_ahb_clk", "video_axi_clk",

		"mmssnoc_axi_clk", "mmagic_video_axi_clk";

		"mmagic_video_axi_clk";

	#clock-cells = <1>;

	qcom,bus-master-id = <MSM_BUS_MASTER_VIDEO_P0>;

};
@@ -173,11 +169,10 @@ 
		<&clock_mmss clk_mmss_mmagic_cfg_ahb_clk>,

		<&clock_mmss clk_smmu_mdp_ahb_clk>,

		<&clock_mmss clk_smmu_mdp_axi_clk>,

		<&clock_gcc clk_mmssnoc_axi_clk>,

		<&clock_mmss clk_mmagic_mdss_axi_clk>;

	clock-names = "mmagic_ahb_clk", "mmagic_cfg_ahb_clk",

		"mdp_ahb_clk", "mdp_axi_clk",

		"mmssnoc_axi_clk", "mmagic_mdss_axi_clk";

		"mmagic_mdss_axi_clk";

	#clock-cells = <1>;

	qcom,bus-master-id = <MSM_BUS_MASTER_MDP_PORT0>;

};
@@ -194,11 +189,10 @@ 
		<&clock_mmss clk_mmss_mmagic_cfg_ahb_clk>,

		<&clock_mmss clk_smmu_rot_ahb_clk>,

		<&clock_mmss clk_smmu_rot_axi_clk>,

		<&clock_gcc clk_mmssnoc_axi_clk>,

		<&clock_mmss clk_mmagic_mdss_axi_clk>;

	clock-names = "mmagic_ahb_clk", "mmagic_cfg_ahb_clk",

		"rot_ahb_clk", "rot_axi_clk",

		"mmssnoc_axi_clk", "mmagic_mdss_axi_clk";

		"mmagic_mdss_axi_clk";

	#clock-cells = <1>;

	qcom,bus-master-id = <MSM_BUS_MASTER_ROTATOR>;

};