1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index c8fc02f111c5..217581469f79 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2075,8 +2075,20 @@ static struct platform_driver arm_smmu_driver = {
 
 static int __init arm_smmu_init(void)
 {
+        struct device_node *np;
         int ret;
 
+        /*
+         * Play nice with systems that don't have an ARM SMMU by checking that
+         * an ARM SMMU exists in the system before proceeding with the driver
+         * and IOMMU bus operation registration.
+         */
+        np = of_find_matching_node(NULL, arm_smmu_of_match);
+        if (!np)
+                return 0;
+
+        of_node_put(np);
+
         ret = platform_driver_register(&arm_smmu_driver);
         if (ret)
                 return ret;