diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-10-11 13:27:31 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-10-11 13:27:31 -0700 |
| commit | 4b981b7bf74d71edaf1f666a10d4ae8ea2eadc9a (patch) | |
| tree | 8795b46ee97b4bc3315d6689ab9a8d5c860e4790 | |
| parent | a4e2c9c9ee3a9c50b378f24d63b34460b2ce0575 (diff) | |
| parent | 4bcdd835f025b141fe0d89dfda1fc61de48eaacb (diff) | |
Merge "ARM: dts: msm: Removed IOMMU test device node for MSM8996"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-arm-smmu-8996.dtsi | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-arm-smmu-8996.dtsi b/arch/arm/boot/dts/qcom/msm-arm-smmu-8996.dtsi index cbe65e266968..527765d34821 100644 --- a/arch/arm/boot/dts/qcom/msm-arm-smmu-8996.dtsi +++ b/arch/arm/boot/dts/qcom/msm-arm-smmu-8996.dtsi @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2016, 2019 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -251,16 +251,3 @@ "gcc_mmss_bimc_gfx_clk", "gcc_bimc_gfx_clk"; #clock-cells = <1>; }; - -&soc { - iommu_test_device { - compatible = "iommu-debug-test"; - /* - * 42 shouldn't be used by anyone on the cpp_fd_smmu. We just - * need _something_ here to get this node recognized by the - * SMMU driver. Our test uses ATOS, which doesn't use SIDs - * anyways, so using a dummy value is ok. - */ - iommus = <&cpp_fd_smmu 42>; - }; -}; |