Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c1c2a1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Rename iommu test devices for sdm845" into msm-4.9

parents 96ba9123 190f44f1
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -212,18 +212,18 @@
		};
	};

	iommu_test_device {
	kgsl_iommu_test_device {
		compatible = "iommu-debug-test";
		/*
		 * 42 shouldn't be used by anyone on the mmss_smmu.  We just
		 * need _something_ here to get this node recognized by the
		 * SMMU driver. Our test uses ATOS, which doesn't use SIDs
		 * 0x7 isn't a valid sid, but should pass the sid sanity check.
		 * 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 = <&kgsl_smmu 0x3>;
		iommus = <&kgsl_smmu 0x7>;
	};

	iommu_test_device2 {
	apps_iommu_test_device {
		compatible = "iommu-debug-test";
		/*
		 * This SID belongs to PCIE. We can't use a fake SID for