diff options
| -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 |