bcma: prepare Kconfig symbol for PCI driver

Driver for PCIe core requires PCI to be enabled, however we shouldn't
require it for the whole bus. Someone may be not interested in extra
PCI devices and what's more there are SoCs without any PCI at all (like
BCM5356C0, BCM5357*, BCM47186B0). For more details see Kconfig "help".
Please note this patch doesn't allow disabling PCI drivers yet, as it
requires more work on calls to bcma_core_pci_* functions.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
index 8be284edc73c5e8d9e4e57e9eecc442414deaae8..9be17d3431bb000a4a18cb515fbb7fe9f7eda0d6 100644 (file)
--- 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 838b4b9d352ffc1d6c7790426bde8502712cc8dc..f32af9b76bcd2aaa7e0da61e26b2e33174803f7f 100644 (file)
--- 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