diff --git a/Documentation/devicetree/bindings/iommu/iommu-debug.txt b/Documentation/devicetree/bindings/iommu/iommu-debug.txt
new file mode 100644
index 000000000000..1d79f1865aa5
--- /dev/null
+++ b/Documentation/devicetree/bindings/iommu/iommu-debug.txt
@@ -0,0 +1,27 @@
+This document describes the device tree binding for IOMMU test devices.
+
+The iommu-debug framework can optionally make use of some platform devices
+for improved standalone testing and other features.
+
+- compatible: iommu-debug-test
+
+
+Required properties
+===================
+
+- iommus: The IOMMU for the test device (see iommu.txt)
+
+
+Example
+=======
+
+	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>;
+	};
diff --git a/drivers/iommu/iommu-debug.c b/drivers/iommu/iommu-debug.c
index dece6cbb9441..6772868d1c9b 100644
--- a/drivers/iommu/iommu-debug.c
+++ b/drivers/iommu/iommu-debug.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016, 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
@@ -1143,6 +1143,30 @@ static inline int iommu_debug_init_tests(void) { return 0; }
 static inline void iommu_debug_destroy_tests(void) { }
 #endif
 
+/*
+ * This isn't really a "driver", we just need something in the device tree
+ * so that our tests can run without any client drivers, and our tests rely
+ * on parsing the device tree for nodes with the `iommus' property.
+ */
+static int iommu_debug_pass(struct platform_device *pdev)
+{
+	return 0;
+}
+
+static const struct of_device_id iommu_debug_of_match[] = {
+	{ .compatible = "iommu-debug-test" },
+	{ },
+};
+
+static struct platform_driver iommu_debug_driver = {
+	.probe = iommu_debug_pass,
+	.remove = iommu_debug_pass,
+	.driver = {
+		.name = "iommu-debug",
+		.of_match_table = iommu_debug_of_match,
+	},
+};
+
 static int iommu_debug_init(void)
 {
 	if (iommu_debug_init_tracking())
@@ -1151,11 +1175,12 @@ static int iommu_debug_init(void)
 	if (iommu_debug_init_tests())
 		return -ENODEV;
 
-	return 0;
+	return platform_driver_register(&iommu_debug_driver);
 }
 
 static void iommu_debug_exit(void)
 {
+	platform_driver_unregister(&iommu_debug_driver);
 	iommu_debug_destroy_tracking();
 	iommu_debug_destroy_tests();
 }