Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f81bd43 authored by Russell King's avatar Russell King Committed by Jason Cooper
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 1f5e6c63

arch/arm/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -573,11 +573,12 @@ config ARCH_MVEBU 
config ARCH_DOVE

config ARCH_DOVE

	bool "Marvell Dove"

	bool "Marvell Dove"

	select CPU_V7

	select CPU_V7

	select PCI

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select NEED_MACH_IO_H

	select NEED_MACH_IO_H

	select PLAT_ORION

	select PLAT_ORION

	select USB_ARCH_HAS_EHCI

	help

	help

	  Support for the Marvell Dove SoC 88AP510

	  Support for the Marvell Dove SoC 88AP510

arch/arm/mach-dove/Makefile

+2 −2
Original line number Original line Diff line number Diff line 
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_DOVE_DB)	+= dove-db-setup.o

obj-$(CONFIG_MACH_CM_A510)	+= cm-a510.o
 
obj-$(CONFIG_MACH_CM_A510)	+= cm-a510.o

arch/arm/mach-dove/common.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -26,7 +26,11 @@ void dove_init_irq(void); 
void dove_setup_cpu_mbus(void);

void dove_setup_cpu_mbus(void);

void dove_ge00_init(struct mv643xx_eth_platform_data *eth_data);

void dove_ge00_init(struct mv643xx_eth_platform_data *eth_data);

void dove_sata_init(struct mv_sata_platform_data *sata_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);

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_ehci0_init(void);

void dove_ehci1_init(void);

void dove_ehci1_init(void);

void dove_uart0_init(void);

void dove_uart0_init(void);