From 0f30f750c43617ece7d57a7979b048bdc7f3a691 Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Thu, 11 Feb 2016 18:37:01 -0800 Subject: [PATCH] iommu: Apply necessary initcall ordering Iommus do not currently support probe deferral. Ensure that they probe after gdscs. Change-Id: I693ce5ba74090a76f0442a3057fe45ff849c3fe1 Signed-off-by: Patrick Daly --- drivers/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/Makefile b/drivers/Makefile index 8013e17a9d1a..5c7df751a0ac 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -50,8 +50,6 @@ obj-$(CONFIG_RESET_CONTROLLER) += reset/ obj-y += tty/ obj-y += char/ -# iommu/ comes before gpu as gpu are using iommu controllers -obj-$(CONFIG_IOMMU_SUPPORT) += iommu/ # gpu/ comes after char for AGP vs DRM startup and after iommu obj-y += gpu/ @@ -146,6 +144,9 @@ obj-y += platform/ #common clk code obj-y += clk/ +# iommu/ comes before gpu as gpu are using iommu controllers +obj-$(CONFIG_IOMMU_SUPPORT) += iommu/ + obj-$(CONFIG_MAILBOX) += mailbox/ obj-$(CONFIG_HWSPINLOCK) += hwspinlock/ obj-$(CONFIG_REMOTEPROC) += remoteproc/