Browse Source

pci: Fix mismerge with v2021.10-rc4

With legacy PCI code removed and thus DM_PCI also removed, a few places
did not get correctly updated with the merge to next and thus broke.
Remove now extraneous dependencies on DM_PCI.

Signed-off-by: Tom Rini <trini@konsulko.com>
Tom Rini 2 years ago
parent
commit
36f890f6b0
2 changed files with 1 additions and 7 deletions
  1. 1 1
      drivers/ata/Kconfig
  2. 0 6
      drivers/pci/Kconfig

+ 1 - 1
drivers/ata/Kconfig

@@ -36,7 +36,7 @@ menu "SATA/SCSI device support"
 
 config AHCI_PCI
 	bool "Support for PCI-based AHCI controller"
-	depends on DM_PCI
+	depends on PCI
 	depends on DM_SCSI
 	help
 	  Enables support for the PCI-based AHCI controller.

+ 0 - 6
drivers/pci/Kconfig

@@ -21,7 +21,6 @@ config DM_PCI_COMPAT
 
 config PCI_AARDVARK
 	bool "Enable Aardvark PCIe driver"
-	depends on DM_PCI
 	depends on DM_GPIO
 	depends on ARMADA_3700
 	help
@@ -37,7 +36,6 @@ config PCI_PNP
 
 config PCI_REGION_MULTI_ENTRY
 	bool "Enable Multiple entries of region type MEMORY in ranges for PCI"
-	depends on PCI || DM_PCI
 	help
 	  Enable PCI memory regions to be of multiple entry. Multiple entry
 	  here refers to allow more than one count of address ranges for MEMORY
@@ -57,7 +55,6 @@ config PCI_MAP_SYSTEM_MEMORY
 
 config PCI_SRIOV
 	bool "Enable Single Root I/O Virtualization support for PCI"
-	depends on PCI || DM_PCI
 	help
 	  Say Y here if you want to enable PCI Single Root I/O Virtualization
 	  capability support. This helps to enumerate Virtual Function devices
@@ -66,7 +63,6 @@ config PCI_SRIOV
 
 config PCI_ARID
         bool "Enable Alternate Routing-ID support for PCI"
-        depends on PCI || DM_PCI
         help
           Say Y here if you want to enable Alternate Routing-ID capability
           support on PCI devices. This helps to skip some devices in BDF
@@ -74,14 +70,12 @@ config PCI_ARID
 
 config PCIE_ECAM_GENERIC
 	bool "Generic ECAM-based PCI host controller support"
-	depends on DM_PCI
 	help
 	  Say Y here if you want to enable support for generic ECAM-based
 	  PCIe host controllers, such as the one emulated by QEMU.
 
 config PCIE_ECAM_SYNQUACER
 	bool "SynQuacer ECAM-based PCI host controller support"
-	depends on DM_PCI
 	select PCI_INIT_R
 	select PCI_REGION_MULTI_ENTRY
 	help