diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-09 20:34:13 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-09-21 17:07:26 +0000 |
| commit | 0f81bd438bed6af47a01a97d5ecbb23a7e478de6 (patch) | |
| tree | 68b0e659341e30fe337de9b7963f092945c90803 | |
| parent | 1f5e6c639e25de9f059ea0e0181a5baeb3b3f4bf (diff) | |
| download | kernel_goldelico_gta04-0f81bd438bed6af47a01a97d5ecbb23a7e478de6.zip kernel_goldelico_gta04-0f81bd438bed6af47a01a97d5ecbb23a7e478de6.tar.gz kernel_goldelico_gta04-0f81bd438bed6af47a01a97d5ecbb23a7e478de6.tar.bz2 | |
ARM: Dove: allow PCI to be disabled
Allow PCI support for Dove to be disabled. Some platforms do not have
anything connected to the PCIe ports, so requiring PCI support to be
built into the kernel just wastes space, and presents a lot more config
options than are necessary.
However, select USB_ARCH_HAS_EHCI so that we can still have EHCI
support.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
| -rw-r--r-- | arch/arm/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-dove/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/mach-dove/common.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2f88d8d..95041b9 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -573,11 +573,12 @@ config ARCH_MVEBU config ARCH_DOVE bool "Marvell Dove" select CPU_V7 - select PCI select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS + select MIGHT_HAVE_PCI select NEED_MACH_IO_H select PLAT_ORION + select USB_ARCH_HAS_EHCI help Support for the Marvell Dove SoC 88AP510 diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile index fa0f018..5e683ba 100644 --- a/arch/arm/mach-dove/Makefile +++ b/arch/arm/mach-dove/Makefile @@ -1,4 +1,4 @@ -obj-y += common.o addr-map.o irq.o pcie.o mpp.o - +obj-y += common.o addr-map.o irq.o mpp.o +obj-$(CONFIG_PCI) += pcie.o obj-$(CONFIG_MACH_DOVE_DB) += dove-db-setup.o obj-$(CONFIG_MACH_CM_A510) += cm-a510.o diff --git a/arch/arm/mach-dove/common.h b/arch/arm/mach-dove/common.h index 6432a3b..1a23340 100644 --- a/arch/arm/mach-dove/common.h +++ b/arch/arm/mach-dove/common.h @@ -26,7 +26,11 @@ void dove_init_irq(void); void dove_setup_cpu_mbus(void); void dove_ge00_init(struct mv643xx_eth_platform_data *eth_data); void dove_sata_init(struct mv_sata_platform_data *sata_data); +#ifdef CONFIG_PCI void dove_pcie_init(int init_port0, int init_port1); +#else +static inline void dove_pcie_init(int init_port0, int init_port1) { } +#endif void dove_ehci0_init(void); void dove_ehci1_init(void); void dove_uart0_init(void); |