diff options
| author | Mitchel Humpherys <mitchelh@codeaurora.org> | 2015-03-18 16:13:05 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:11:51 -0700 |
| commit | c3ca4f6f1fdfd6d04c638204a9ca0e19727f2eee (patch) | |
| tree | 1feae1da785a50a6802f08b303402a833e9dd529 | |
| parent | 19fe116e06b146c4792c2892b818b55065bf9e47 (diff) | |
Revert "iommu/arm-smmu: make PCI usage optional"
This reverts commit b20594eac137b78c6e55eb1872ceb72ea98edbef, whose
original intent was to workaround a bug in the PCI driver that has since
been fixed. Also rip it out of msm_defconfig.
Change-Id: Ied8349545f872b4fc23b46b15d13677279ad9ae1
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
[pdaly@codeaurora.org Resolve minor conflicts]
Signed-off-by: Patrick Daly <pdaly@codeaurora.org>
| -rw-r--r-- | drivers/iommu/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index 5ce64f06c31d..b9094e9da537 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -393,13 +393,4 @@ config S390_IOMMU help Support for the IOMMU API for s390 PCI devices. -config ARM_SMMU_DONT_USE_PCI - bool "Don't use the ARM SMMU driver on PCI bus" - depends on ARM_SMMU - help - Don't use the ARM SMMU driver as the IOMMU on the PCI bus. - - Say Y here if your SoC's PCI driver is busted such that the ARM - SMMU driver doesn't work on the PCI bus. - endif # IOMMU_SUPPORT diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index db57fac386e8..5bfe25878a66 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2805,7 +2805,7 @@ static int __init arm_smmu_init(void) bus_set_iommu(&amba_bustype, &arm_smmu_ops); #endif -#if defined(CONFIG_PCI) && !defined(CONFIG_ARM_SMMU_DONT_USE_PCI) +#ifdef CONFIG_PCI if (!iommu_present(&pci_bus_type)) bus_set_iommu(&pci_bus_type, &arm_smmu_ops); #endif |