diff options
| author | Mitchel Humpherys <mitchelh@codeaurora.org> | 2016-07-26 11:27:10 -0700 |
|---|---|---|
| committer | Liam Mark <lmark@codeaurora.org> | 2016-08-01 13:49:09 -0700 |
| commit | f1fa301f977f06dcf990c0452d85e2f67d8cbbf1 (patch) | |
| tree | 7e303bf3920dc119c5d72d05a626c8a1bd93c536 | |
| parent | 6fbe4a9662e808bf381a834d85c4b5e08f9241df (diff) | |
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>
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi b/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi index ab46221089f3..3de3cd5f8de9 100644 --- a/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msm-arm-smmu-cobalt.dtsi @@ -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>; diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index e748783b0c7d..9dc96b8b3209 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -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>; |