diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-03 21:12:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-03 21:12:50 -0700 |
| commit | 62fc2827aea9ec94ef79c99af88ac97613dee93d (patch) | |
| tree | bf80be6ed7981eb8cbdf96f867b100c531bfb0cb /arch | |
| parent | 4859f1dc3c197b2dc4d334ef6700aedd6a08a6b6 (diff) | |
| parent | f1fa301f977f06dcf990c0452d85e2f67d8cbbf1 (diff) | |
Merge "ARM: dts: msm: Remove bogus stream ID from PCIe IOMMU"
Diffstat (limited to 'arch')
| -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 6912ae1033af..b8735096796e 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -1479,7 +1479,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>; |