diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-30 20:50:21 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-30 20:50:21 -0800 |
| commit | eb1480ce5a93bdf1e8b42c4ce0e5365253e78bd4 (patch) | |
| tree | 58012139c94fb753c93dd2e67ff43d4e3665a8c9 /arch | |
| parent | e24ebad9312a53fd729caa9d97ca5bbeeb47b94a (diff) | |
| parent | 2ced86123e2de3a7f8702ec8c3fd882a8b0fccfa (diff) | |
Merge "ARM: dts: msm: Disable iommu test device on msm8996 vplatform"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-smmu.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-smmu.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-smmu.dtsi index 65eaa0c5aef9..2076ba08280e 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-smmu.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-smmu.dtsi @@ -39,7 +39,7 @@ }; &cpp_fd_smmu { - status = "ok"; + status = "disabled"; qcom,register-save; qcom,skip-init; qcom,fatal-asf; @@ -71,5 +71,6 @@ * anyways, so using a dummy value is ok. */ iommus = <&cpp_fd_smmu 42>; + status = "disabled"; }; }; |