Commit f1fa301f authored Jul 26, 2016 by Mitchel Humpherys Committed by Liam Mark Aug 01, 2016

ARM: dts: msm: Remove bogus stream ID from PCIe IOMMU



There's currently a placeholder stream ID of "1" in the PCIe RC device
tree node.  The PCIe RC doesn't actually attach and doesn't need a
stream ID though, the "1" was put there to get around an error caused by
the fact that #iommu-cells was equal to 1 for the anoc1_smmu, even
though it should have actually been 0.

Fix all this by making #iommu-cells = <0> for the anoc1 SMMU and
removing the bogus placeholder stream ID.

CRs-Fixed: 1036401
Change-Id: I73ff6d6b081b1ee00c8e8ebea42e86160b35aa37
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>

parent 6fbe4a96

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@
		status = "ok";
		compatible = "qcom,smmu-v2";
		reg = <0x1680000 0x10000>;
		#iommu-cells = <1>;
		#iommu-cells = <0>;
		qcom,register-save;
		qcom,skip-init;
		#global-interrupts = <2>;

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -1458,7 +1458,7 @@
		qcom,pcie-phy-ver = <0x20>;
		qcom,use-19p2mhz-aux-clk;

		iommus = <&anoc1_smmu 0x1>;
		iommus = <&anoc1_smmu>;
		qcom,smmu-exist;
		qcom,smmu-sid-base = <0x1480>;