2 files changed, 19 insertions, 2 deletions

diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
index 8be284edc73c..9be17d3431bb 100644
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
@@ -26,6 +26,7 @@ config BCMA_HOST_PCI_POSSIBLE
 config BCMA_HOST_PCI
         bool "Support for BCMA on PCI-host bus"
         depends on BCMA_HOST_PCI_POSSIBLE
+        select BCMA_DRIVER_PCI
         default y
 
 config BCMA_DRIVER_PCI_HOSTMODE
@@ -44,6 +45,22 @@ config BCMA_HOST_SOC
 
           If unsure, say N
 
+# TODO: make it depend on PCI when ready
+config BCMA_DRIVER_PCI
+        bool
+        default y
+        help
+          BCMA bus may have many versions of PCIe core. This driver
+          supports:
+          1) PCIe core working in clientmode
+          2) PCIe Gen 2 clientmode core
+
+          In general PCIe (Gen 2) clientmode core is required on PCIe
+          hosted buses. It's responsible for initialization and basic
+          hardware management.
+          This driver is also prerequisite for a hostmode PCIe core
+          support.
+
 config BCMA_DRIVER_MIPS
         bool "BCMA Broadcom MIPS core driver"
         depends on BCMA && MIPS
diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile
index 838b4b9d352f..f32af9b76bcd 100644
--- a/drivers/bcma/Makefile
+++ b/drivers/bcma/Makefile
@@ -3,8 +3,8 @@ bcma-y					+= driver_chipcommon.o driver_chipcommon_pmu.o
 bcma-y                                  += driver_chipcommon_b.o
 bcma-$(CONFIG_BCMA_SFLASH)              += driver_chipcommon_sflash.o
 bcma-$(CONFIG_BCMA_NFLASH)              += driver_chipcommon_nflash.o
-bcma-y                                  += driver_pci.o
-bcma-y                                  += driver_pcie2.o
+bcma-$(CONFIG_BCMA_DRIVER_PCI)          += driver_pci.o
+bcma-$(CONFIG_BCMA_DRIVER_PCI)          += driver_pcie2.o
 bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE) += driver_pci_host.o
 bcma-$(CONFIG_BCMA_DRIVER_MIPS)         += driver_mips.o
 bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)     += driver_gmac_cmn.o